X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fuser%2Fcheatsheet.itely;h=f080f81e41d086d698938862b2f46d28bbbbb75d;hb=2831bf0efa83d07954e8c1f130402d95f161941b;hp=b221076f7183d7a1397289bfdc33bc49f34612dc;hpb=bdc3b32b8cdf1300d37fe9c4966e155979d2c766;p=lilypond.git

diff --git a/Documentation/user/cheatsheet.itely b/Documentation/user/cheatsheet.itely
index b221076f71..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,38 +15,38 @@
 @item @code{1 2 8 16}
 @tab durations 
 @tab
-@lilypond[relative=2,notime]
+@lilypond[fragment,relative=2,notime]
 \set Staff.autoBeaming = ##f
-\set Staff.Clef = \turnOff
+\override Staff.Clef #'break-visibility = #all-invisible
 c1 c2 c8 c16
 @end lilypond
 
 @item @code{c4. c4..}
 @tab augmentation dots
 @tab
-@lilypond[relative=2,notime]
-\set 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=2,notime]
+@lilypond[fragment,relative=1,notime]
 c d e f g a b
 @end lilypond
 
 @item @code{fis bes}
 @tab alteration 
 @tab
-@lilypond[relative=1,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,8 +56,8 @@ s4_" "
 @item @code{\time 3/4 \time 4/4 }
 @tab time signature
 @tab
-@lilypond
-\override Staff.Clef   #'transparent = ##t 
+@lilypond[fragment]
+\override Staff.Clef #'transparent = ##t 
 \time 3/4
 s4_" "
 \time 4/4
@@ -66,15 +68,15 @@ s16_" "
 @item @code{r4 r8}
 @tab rest 
 @tab
-@lilypond[relative=2,notime]
-\set Staff.Clef = \turnOff
+@lilypond[relative=2,notime,fragment]
+\override Staff.Clef #'break-visibility = #all-invisible
 r4 r8
 @end lilypond
 
 @item @code{d ~ d}
 @tab tie
 @tab
-@lilypond[relative=2,notime]
+@lilypond[relative=2,notime,fragment]
 \set Score.timing = ##f
 \set Staff.autoBeaming = ##f
 d ~ d
@@ -83,7 +85,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 +94,7 @@ s4
 @item @var{note}@code{'}
 @tab raise octave
 @tab
-@lilypond[relative=2,notime]
+@lilypond[relative=2,notime,fragment]
 \set Score.timing = ##f
 \set Staff.autoBeaming = ##f
 a a'
@@ -101,7 +103,7 @@ a a'
 @item @var{note}@code{,}
 @tab lower octave
 @tab
-@lilypond[relative=2,notime]
+@lilypond[relative=2,notime,fragment]
 \set Score.timing = ##f
 \set Staff.autoBeaming = ##f
 c c,
@@ -113,7 +115,7 @@ c c,
 @tab
 @lilypond[fragment,relative=2]
 \set Score.timing = ##f
-\set Staff.TimeSignature = \turnOff
+\override Staff.TimeSignature #'break-visibility = #all-invisible
 \set Staff.autoBeaming = ##f
 c( d e)
 @end lilypond
@@ -124,9 +126,9 @@ c( d e)
 @tab
 @lilypond[fragment,relative=2]
 \set Score.timing = ##f
-\set Staff.TimeSignature = \turnOff
+\override Staff.TimeSignature #'break-visibility = #all-invisible
 \set Staff.autoBeaming = ##f
-c\(  c( d) e\)
+c\( c( d) e\)
 @end lilypond
 
 
@@ -135,7 +137,7 @@ c\(  c( d) e\)
 @tab
 @lilypond[fragment,relative=2]
 \set Score.timing = ##f
-\set Staff.TimeSignature = \turnOff
+\override Staff.TimeSignature #'break-visibility = #all-invisible
 \set Staff.autoBeaming = ##f
 a8-[ b-]
 @end lilypond
@@ -154,7 +156,7 @@ a8-[ b-]
 @tab articulations
 @tab
 @lilypond[fragment,relative=2]
-\set Staff.TimeSignature = \turnOff
+\override Staff.TimeSignature #'break-visibility = #all-invisible
 c-> c-.
 @end lilypond
 
@@ -163,27 +165,27 @@ c-> c-.
 @tab dynamics
 @tab
 @lilypond[fragment,relative=2]
-\set Staff.TimeSignature = \turnOff
+\override Staff.TimeSignature #'break-visibility = #all-invisible
 c\mf c\sfz
 @end lilypond
 
 
-@item @code{a\< b\!}
+@item @code{a\< a \!a}
 @tab crescendo
 @tab
 @lilypond[fragment,relative=2]
 \set Score.timing = ##f
-\set Staff.TimeSignature = \turnOff
+\override Staff.TimeSignature #'break-visibility = #all-invisible
 \set Staff.autoBeaming = ##f
 a\< a \!a
 @end lilypond
 
-@item @code{a\> b\!}
+@item @code{a\> a a\!}
 @tab decrescendo
 @tab
 @lilypond[fragment,relative=2]
 \set Score.timing = ##f
-\set Staff.TimeSignature = \turnOff
+\override Staff.TimeSignature #'break-visibility = #all-invisible
 \set Staff.autoBeaming = ##f
 a\> a a\!
 @end lilypond
@@ -201,16 +203,16 @@ a\> a a\!
 @tab upstep
 @tab
 @lilypond[fragment,relative=2]
-  \partial 8
-  f8 c2 d e
+\partial 8
+f8 c2 d e
 @end lilypond
 
 
 @item @code{\times 2/3 @{f g a@}}
 @tab triplets
 @tab
-@lilypond[relative=2,fragment]
-  \times 2/3 { f8 g a }
+@lilypond[relative=1,fragment]
+\times 2/3 { f8 g a }
 @end lilypond
 
 
@@ -218,10 +220,10 @@ a\> a a\!
 @tab grace notes
 @tab
 @lilypond[relative=2,fragment]
-\context Voice {  \grace b16 c4 }
+\context Voice { \grace b16 c4 }
 @end lilypond
 
-@item @code{\lyrics @{ twinkle @}}
+@item @code{\lyricmode @{ twinkle @}}
 @tab entering lyrics
 @tab
 
@@ -231,36 +233,37 @@ a\> a a\!
 @tab
 twinkle
 @lilypond[fragment]
-\lyrics \new Lyrics { twinkle }
+\new Lyrics \lyricmode { twinkle }
 @end lilypond
 
 @item @code{twin -- kle}
 @tab lyric hyphen 
 @tab
 @lilypond[fragment,relative=2]
- << \notes { g'4 g }
-    \lyricsto "" \new Lyrics \lyrics {  twin -- kle }
-    >> 
+<<
+   { g'4 g }
+  \new Lyrics \lyricsto "" { twin -- kle }
+>> 
 @end lilypond
 
-@item @code{\chords @{ c:dim f:maj7 @}}
+@item @code{\chordmode @{ c:dim f:maj7 @}}
 @tab chords 
 @tab
 @lilypond[fragment,relative=2]
-  \chords { c:dim f:maj7 }
+\chordmode { c:dim f:maj7 }
 @end lilypond
 
 @item @code{\context ChordNames}
 @tab printing chord names 
 @tab
 @lilypond[fragment,relative=2]
-  \context ChordNames \chords { c:dim f:maj7 }
+\chords { c:dim f:maj7 }
 @end lilypond
 
 @item @code{<<@{e f@} \\@{c d@}>>}
 @tab polyphony
 @tab
-@lilypond[fragment,relative=3]
+@lilypond[fragment,relative=2]
 \context Staff <<{e f} \\ {c d}>>
 @end lilypond