X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fuser%2Fcheatsheet.itely;h=1bef3ccfebc123b77783438034da6b9f50f7c11d;hb=1f3b8cf85db24896d7021f8babda94bd48a48ebe;hp=44507391ddc2219d6682da190bef84185192d24c;hpb=e8313629f67d876c0056a50931887e8a47a8a7cd;p=lilypond.git

diff --git a/Documentation/user/cheatsheet.itely b/Documentation/user/cheatsheet.itely
index 44507391dd..1bef3ccfeb 100644
--- a/Documentation/user/cheatsheet.itely
+++ b/Documentation/user/cheatsheet.itely
@@ -1,10 +1,20 @@
-@c -*-texinfo-*-
+@c -*- coding: utf-8; mode: texinfo; -*-
+@c This file is part of lilypond.tely
+@ignore
+    Translation of GIT committish: FILL-IN-HEAD-COMMITTISH
+
+    When revising a translation, copy the HEAD committish of the
+    version that you are working on.  See TRANSLATION for details.
+@end ignore
+
+
+@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 +23,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{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]
+@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,8 +64,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
@@ -66,24 +76,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{d ~ d}
 @tab tie
 @tab
-@lilypond[relative=1,notime]
-\property Score.timing = ##f
-\property Staff.autoBeaming = ##f
+@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 
@@ -92,18 +102,18 @@ s4
 @item @var{note}@code{'}
 @tab raise octave
 @tab
-@lilypond[relative=1,notime]
-\property Score.timing = ##f
-\property Staff.autoBeaming = ##f
+@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
+@lilypond[relative=2,notime,fragment]
+\set Score.timing = ##f
+\set Staff.autoBeaming = ##f
 c c,
 @end lilypond
 
@@ -111,10 +121,10 @@ c c,
 @item @code{c( d e)}
 @tab slur
 @tab
-@lilypond[fragment,relative=1]
-\property Score.timing = ##f
-\property Staff.TimeSignature = \turnOff
-\property Staff.autoBeaming = ##f
+@lilypond[fragment,relative=2]
+\set Score.timing = ##f
+\set Staff.implicitTimeSignatureVisibility = #all-invisible
+\set Staff.autoBeaming = ##f
 c( d e)
 @end lilypond
 
@@ -122,21 +132,21 @@ c( d e)
 @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
-c\(  c( d) e\)
+@lilypond[fragment,relative=2]
+\set Score.timing = ##f
+\set Staff.implicitTimeSignatureVisibility = #all-invisible
+\set Staff.autoBeaming = ##f
+c\( c( d) e\)
 @end lilypond
 
 
 @item @code{a8[ b]}
 @tab beam
 @tab
-@lilypond[fragment,relative=1]
-\property Score.timing = ##f
-\property Staff.TimeSignature = \turnOff
-\property Staff.autoBeaming = ##f
+@lilypond[fragment,relative=2]
+\set Score.timing = ##f
+\set Staff.implicitTimeSignatureVisibility = #all-invisible
+\set Staff.autoBeaming = ##f
 a8-[ b-]
 @end lilypond
 
@@ -153,8 +163,8 @@ a8-[ b-]
 @item @code{c-> c-.}
 @tab articulations
 @tab
-@lilypond[fragment,relative=1]
-\property Staff.TimeSignature = \turnOff
+@lilypond[fragment,relative=2]
+\set Staff.implicitTimeSignatureVisibility = #all-invisible
 c-> c-.
 @end lilypond
 
@@ -162,29 +172,29 @@ c-> c-.
 @item @code{c\mf c\sfz}
 @tab dynamics
 @tab
-@lilypond[fragment,relative=1]
-\property Staff.TimeSignature = \turnOff
+@lilypond[fragment,relative=2]
+\set Staff.implicitTimeSignatureVisibility = #all-invisible
 c\mf c\sfz
 @end lilypond
 
 
-@item @code{a\< b\!}
+@item @code{a\< a a\!}
 @tab crescendo
 @tab
-@lilypond[fragment,relative=1]
-\property Score.timing = ##f
-\property Staff.TimeSignature = \turnOff
-\property Staff.autoBeaming = ##f
-a\< a \!a
+@lilypond[fragment,relative=2]
+\set Score.timing = ##f
+\set Staff.implicitTimeSignatureVisibility = #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=1]
-\property Score.timing = ##f
-\property Staff.TimeSignature = \turnOff
-\property Staff.autoBeaming = ##f
+@lilypond[fragment,relative=2]
+\set Score.timing = ##f
+\set Staff.implicitTimeSignatureVisibility = #all-invisible
+\set Staff.autoBeaming = ##f
 a\> a a\!
 @end lilypond
 
@@ -192,7 +202,7 @@ a\> a a\!
 @item @code{< >}
 @tab chord
 @tab
-@lilypond[fragment,relative=1]
+@lilypond[fragment,relative=2]
 <c e> 
 @end lilypond
 
@@ -200,58 +210,65 @@ 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 @{ @dots{} @}}
+@item @code{\lyricmode @{ twinkle @}}
 @tab entering lyrics
 @tab
+twinkle
 
-@item @code{\context Lyrics}
+
+@item @code{\new Lyrics}
 @tab printing lyrics
 @tab
+@lilypond[fragment]
+\new Lyrics \lyricmode { twinkle }
+@end lilypond
 
 @item @code{twin -- kle}
 @tab lyric hyphen 
 @tab
-@lilypond[fragment,relative=1]
- \notes { g'4 g }
-  \lyricsto "" \new LyricsVoice \lyrics {  twin -- kle }
-@end lilypond 
+@lilypond[fragment,relative=2]
+<<
+   { g'1 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=1]
-  \chords { c:dim f:maj7 }
-@end lilypond 
+@lilypond[fragment,relative=2]
+\chordmode { 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]
+\chords { c:dim f:maj7 }
+@end lilypond
 
-@item @code{<<@{e f@} \\@{c d@}>>}
+@item @code{<<@{e f@} \\ @{c d@}>>}
 @tab polyphony
 @tab
 @lilypond[fragment,relative=2]