X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fuser%2Fcheatsheet.itely;h=5e174d1f527b4f70e01e58fbc10c3e967bbf7876;hb=e0412b07662da2a8f812f18b153913e43de02580;hp=b39f168d157302b411b6ccdb75f493d34203737e;hpb=e37010af17faa8b185de836664b6544bd29dc1d0;p=lilypond.git

diff --git a/Documentation/user/cheatsheet.itely b/Documentation/user/cheatsheet.itely
index b39f168d15..5e174d1f52 100644
--- a/Documentation/user/cheatsheet.itely
+++ b/Documentation/user/cheatsheet.itely
@@ -1,5 +1,8 @@
 @c -*-texinfo-*-
 
+
+@c TODO: add tablature.
+
 @node Cheat sheet
 @appendix Cheat sheet
 
@@ -13,7 +16,7 @@
 @item @code{1 2 8 16}
 @tab durations 
 @tab
-@lilypond[relative=1,notime]
+@lilypond[fragment,relative=2,notime]
 \set Staff.autoBeaming = ##f
 \set Staff.Clef = \turnOff
 c1 c2 c8 c16
@@ -22,7 +25,7 @@ c1 c2 c8 c16
 @item @code{c4. c4..}
 @tab augmentation dots
 @tab
-@lilypond[relative=1,notime]
+@lilypond[fragment,relative=2,notime]
 \set Staff.Clef = \turnOff
 c4. c4..  
 @end lilypond
@@ -30,21 +33,21 @@ c4. c4..
 @item @code{c d e f g a b }
 @tab scale 
 @tab
-@lilypond[relative=1,notime]
+@lilypond[fragment,relative=1,notime]
 c d e f g a b
 @end lilypond
 
 @item @code{fis bes}
 @tab alteration 
 @tab
-@lilypond[relative,notime]
+@lilypond[fragment,relative=1,notime]
 fis bes
 @end lilypond
 
 @item @code{\clef treble \clef bass }
 @tab clefs
 @tab
-@lilypond[notime]
+@lilypond[fragment,notime]
 \clef treble
 s4_" "
 \clef bass
@@ -54,7 +57,7 @@ s4_" "
 @item @code{\time 3/4 \time 4/4 }
 @tab time signature
 @tab
-@lilypond
+@lilypond[fragment]
 \override Staff.Clef   #'transparent = ##t 
 \time 3/4
 s4_" "
@@ -66,7 +69,7 @@ s16_" "
 @item @code{r4 r8}
 @tab rest 
 @tab
-@lilypond[relative=1,notime]
+@lilypond[relative=2,notime,fragment]
 \set Staff.Clef = \turnOff
 r4 r8
 @end lilypond
@@ -74,7 +77,7 @@ r4 r8
 @item @code{d ~ d}
 @tab tie
 @tab
-@lilypond[relative=1,notime]
+@lilypond[relative=2,notime,fragment]
 \set Score.timing = ##f
 \set Staff.autoBeaming = ##f
 d ~ d
@@ -83,7 +86,7 @@ d ~ d
 @item @code{\key es \major }
 @tab key signature
 @tab
-@lilypond[notime]
+@lilypond[notime,fragment]
 \clef treble
 \key es \major
 s4 
@@ -92,7 +95,7 @@ s4
 @item @var{note}@code{'}
 @tab raise octave
 @tab
-@lilypond[relative=1,notime]
+@lilypond[relative=2,notime,fragment]
 \set Score.timing = ##f
 \set Staff.autoBeaming = ##f
 a a'
@@ -101,7 +104,7 @@ a a'
 @item @var{note}@code{,}
 @tab lower octave
 @tab
-@lilypond[relative=1,notime]
+@lilypond[relative=2,notime,fragment]
 \set Score.timing = ##f
 \set Staff.autoBeaming = ##f
 c c,
@@ -111,7 +114,7 @@ c c,
 @item @code{c( d e)}
 @tab slur
 @tab
-@lilypond[fragment,relative=1]
+@lilypond[fragment,relative=2]
 \set Score.timing = ##f
 \set Staff.TimeSignature = \turnOff
 \set Staff.autoBeaming = ##f
@@ -122,7 +125,7 @@ c( d e)
 @item @code{c\( c( d) e\)}
 @tab phrasing slur
 @tab
-@lilypond[fragment,relative=1]
+@lilypond[fragment,relative=2]
 \set Score.timing = ##f
 \set Staff.TimeSignature = \turnOff
 \set Staff.autoBeaming = ##f
@@ -133,7 +136,7 @@ c\(  c( d) e\)
 @item @code{a8[ b]}
 @tab beam
 @tab
-@lilypond[fragment,relative=1]
+@lilypond[fragment,relative=2]
 \set Score.timing = ##f
 \set Staff.TimeSignature = \turnOff
 \set Staff.autoBeaming = ##f
@@ -153,7 +156,7 @@ a8-[ b-]
 @item @code{c-> c-.}
 @tab articulations
 @tab
-@lilypond[fragment,relative=1]
+@lilypond[fragment,relative=2]
 \set Staff.TimeSignature = \turnOff
 c-> c-.
 @end lilypond
@@ -162,26 +165,26 @@ c-> c-.
 @item @code{c\mf c\sfz}
 @tab dynamics
 @tab
-@lilypond[fragment,relative=1]
+@lilypond[fragment,relative=2]
 \set Staff.TimeSignature = \turnOff
 c\mf c\sfz
 @end lilypond
 
 
-@item @code{a\< b\!}
+@item @code{a\< a \!a}
 @tab crescendo
 @tab
-@lilypond[fragment,relative=1]
+@lilypond[fragment,relative=2]
 \set Score.timing = ##f
 \set Staff.TimeSignature = \turnOff
 \set Staff.autoBeaming = ##f
 a\< a \!a
 @end lilypond
 
-@item @code{a\> b\!}
+@item @code{a\> a a\!}
 @tab decrescendo
 @tab
-@lilypond[fragment,relative=1]
+@lilypond[fragment,relative=2]
 \set Score.timing = ##f
 \set Staff.TimeSignature = \turnOff
 \set Staff.autoBeaming = ##f
@@ -192,7 +195,7 @@ a\> a a\!
 @item @code{< >}
 @tab chord
 @tab
-@lilypond[fragment,relative=1]
+@lilypond[fragment,relative=2]
 <c e> 
 @end lilypond
 
@@ -200,25 +203,25 @@ a\> a a\!
 @item @code{\partial 8}
 @tab upstep
 @tab
-@lilypond[fragment,relative=1]
-  \partial 8
-  f8 c2 d e
-@end lilypond 
+@lilypond[fragment,relative=2]
+\partial 8
+f8 c2 d e
+@end lilypond
 
 
 @item @code{\times 2/3 @{f g a@}}
 @tab triplets
 @tab
 @lilypond[relative=1,fragment]
-  \times 2/3 { f8 g a }
+\times 2/3 { f8 g a }
 @end lilypond
 
 
 @item @code{\grace}
 @tab grace notes
 @tab
-@lilypond[relative=1,fragment]
-\context Voice {  \grace b16 c4 }
+@lilypond[relative=2,fragment]
+\context Voice { \grace b16 c4 }
 @end lilypond
 
 @item @code{\lyrics @{ twinkle @}}
@@ -230,32 +233,33 @@ a\> a a\!
 @tab printing lyrics
 @tab
 twinkle
-@c cheating .. 
-@c@li lypond[fragment]
-@c  \lyrics \new Lyrics { twinkle }
-@c @end lilypond
+@lilypond[fragment]
+\new Lyrics \lyrics { twinkle }
+@end lilypond
 
 @item @code{twin -- kle}
 @tab lyric hyphen 
 @tab
-@lilypond[fragment,relative=1]
- \notes { g'4 g }
-  \lyricsto "" \new Lyrics \lyrics {  twin -- kle }
-@end lilypond 
+@lilypond[fragment,relative=2]
+<<
+  \notes { g'4 g }
+  \lyricsto "" \new Lyrics { twin -- kle }
+>> 
+@end lilypond
 
 @item @code{\chords @{ c:dim f:maj7 @}}
 @tab chords 
 @tab
-@lilypond[fragment,relative=1]
-  \chords { c:dim f:maj7 }
-@end lilypond 
+@lilypond[fragment,relative=2]
+\chords { c:dim f:maj7 }
+@end lilypond
 
 @item @code{\context ChordNames}
 @tab printing chord names 
 @tab
-@lilypond[fragment,relative=1]
-  \context ChordNames \chords { c:dim f:maj7 }
-@end lilypond 
+@lilypond[fragment,relative=2]
+\context ChordNames \chords { c:dim f:maj7 }
+@end lilypond
 
 @item @code{<<@{e f@} \\@{c d@}>>}
 @tab polyphony