X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fuser%2Fcheatsheet.itely;h=f080f81e41d086d698938862b2f46d28bbbbb75d;hb=6e4061ccca25474d5bc9958f15385bc0c9c28894;hp=c8cdb16f03564459f0adef2148bca690d0824e31;hpb=cb17bf9a8819271d4b102bd4d6949bd994028f67;p=lilypond.git

diff --git a/Documentation/user/cheatsheet.itely b/Documentation/user/cheatsheet.itely
index c8cdb16f03..f080f81e41 100644
--- a/Documentation/user/cheatsheet.itely
+++ b/Documentation/user/cheatsheet.itely
@@ -1,10 +1,12 @@
-@c -*-texinfo-*-
+@c -*- coding: utf-8; mode: texinfo; -*-
+
+@c TODO: add tablature.
 
 @node Cheat sheet
 @appendix Cheat sheet
 
 
-@multitable @columnfractions  .3 .3 .4  
+@multitable @columnfractions .35 .3 .35
 
 @item @b{Syntax}
 @tab @b{Description}
@@ -13,32 +15,38 @@
 @item @code{1 2 8 16}
 @tab durations 
 @tab
-@lilypond[relative 1, notime]
-\property Staff.autoBeaming = ##f
-\property Staff.Clef = \turnOff
+@lilypond[fragment,relative=2,notime]
+\set Staff.autoBeaming = ##f
+\override Staff.Clef #'break-visibility = #all-invisible
 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[fragment,relative=2,notime]
+\override Staff.Clef #'break-visibility = #all-invisible
 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[fragment,relative=1,notime]
 c d e f g a b
 @end lilypond
 
+@item @code{fis bes}
+@tab alteration 
+@tab
+@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
@@ -48,8 +56,8 @@ s4_" "
 @item @code{\time 3/4 \time 4/4 }
 @tab time signature
 @tab
-@lilypond
-\property Staff.Clef \set #'transparent = ##t 
+@lilypond[fragment]
+\override Staff.Clef #'transparent = ##t 
 \time 3/4
 s4_" "
 \time 4/4
@@ -60,25 +68,24 @@ s16_" "
 @item @code{r4 r8}
 @tab rest 
 @tab
-@lilypond[relative 1, notime]
-\property Staff.Clef = \turnOff
+@lilypond[relative=2,notime,fragment]
+\override Staff.Clef #'break-visibility = #all-invisible
 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,fragment]
+\set Score.timing = ##f
+\set Staff.autoBeaming = ##f
 d ~ d
 @end lilypond
 
 @item @code{\key es \major }
 @tab key signature
 @tab
-@lilypond[notime]
+@lilypond[notime,fragment]
 \clef treble
 \key es \major
 s4 
@@ -87,118 +94,183 @@ 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,fragment]
+\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,fragment]
+\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
+\override Staff.TimeSignature #'break-visibility = #all-invisible
+\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
+\override Staff.TimeSignature #'break-visibility = #all-invisible
+\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
+\override Staff.TimeSignature #'break-visibility = #all-invisible
+\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]
+\override Staff.TimeSignature #'break-visibility = #all-invisible
 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]
+\override Staff.TimeSignature #'break-visibility = #all-invisible
+c\mf c\sfz
 @end lilypond
 
 
-@item @code{\< \!}
+@item @code{a\< a \!a}
 @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
+\override Staff.TimeSignature #'break-visibility = #all-invisible
+\set Staff.autoBeaming = ##f
 a\< a \!a
 @end lilypond
 
-@item @code{\> \!}
+@item @code{a\> a a\!}
 @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
+\override Staff.TimeSignature #'break-visibility = #all-invisible
+\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=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 }
+@end lilypond
+
+
+@item @code{\grace}
+@tab grace notes
+@tab
+@lilypond[relative=2,fragment]
+\context Voice { \grace b16 c4 }
 @end lilypond
 
+@item @code{\lyricmode @{ twinkle @}}
+@tab entering lyrics
+@tab
+
+
+@item @code{\new Lyrics}
+@tab printing lyrics
+@tab
+twinkle
+@lilypond[fragment]
+\new Lyrics \lyricmode { twinkle }
+@end lilypond
+
+@item @code{twin -- kle}
+@tab lyric hyphen 
+@tab
+@lilypond[fragment,relative=2]
+<<
+   { g'4 g }
+  \new Lyrics \lyricsto "" { twin -- kle }
+>> 
+@end lilypond
+
+@item @code{\chordmode @{ c:dim f:maj7 @}}
+@tab chords 
+@tab
+@lilypond[fragment,relative=2]
+\chordmode { c:dim f:maj7 }
+@end lilypond
+
+@item @code{\context ChordNames}
+@tab printing chord names 
+@tab
+@lilypond[fragment,relative=2]
+\chords { c:dim f:maj7 }
+@end lilypond
+
+@item @code{<<@{e f@} \\@{c d@}>>}
+@tab polyphony
+@tab
+@lilypond[fragment,relative=2]
+\context Staff <<{e f} \\ {c d}>>
+@end lilypond
+
+
+@item @code{s4 s8 s16}
+@tab spacer rests
+@tab
+
 @end multitable