X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fuser%2Fcheatsheet.itely;h=87d48f9621f567148594f73c2d5944994f515d50;hb=9eb91bf0569290dc1aa316f32a466efb76fc6a1a;hp=8508c016061345cbfe1c132971125f0f0b4fa720;hpb=2f289b8fa4051f39d5e1bee37fda238140c76e95;p=lilypond.git

diff --git a/Documentation/user/cheatsheet.itely b/Documentation/user/cheatsheet.itely
index 8508c01606..87d48f9621 100644
--- a/Documentation/user/cheatsheet.itely
+++ b/Documentation/user/cheatsheet.itely
@@ -1,52 +1,62 @@
-@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 \version "2.12.0"
+
+
+@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}
 @tab @b{Example}
 
 @item @code{1 2 8 16}
-@tab durations 
+@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
-c4. c4..  
+@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 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 alteration
 @tab
-@lilypond[relative 1, notime]
-\property Staff.Clef = \turnOff
+@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
@@ -56,8 +66,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,194 +76,223 @@ s16_" "
 
 
 @item @code{r4 r8}
-@tab rest 
+@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 
+s4
 @end lilypond
 
 @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
+\set Staff.implicitTimeSignatureVisibility = #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
+\set Staff.implicitTimeSignatureVisibility = #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
+\set Staff.implicitTimeSignatureVisibility = #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 {
+     \set Staff.implicitTimeSignatureVisibility = #all-invisible
+     c'1
+   }
+   \new Staff {
+     \set Staff.implicitTimeSignatureVisibility = #all-invisible
+     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.implicitTimeSignatureVisibility = #all-invisible
 c-> c-.
 @end lilypond
 
 
-@item @code{-\mf -\sfz}
+@item @code{c2\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.implicitTimeSignatureVisibility = #all-invisible
+c2\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
-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{-\> -\!}
+@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
+\set Staff.implicitTimeSignatureVisibility = #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]
+\set Staff.implicitTimeSignatureVisibility = #all-invisible
+<c e>
 @end lilypond
 
 
 @item @code{\partial 8}
 @tab upstep
 @tab
-@lilypond[fragment]
-  \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}
+@item @code{\times 2/3 @{f g a@}}
 @tab triplets
 @tab
-@lilypond[relative 1,fragment]
-  \times 2/3 { f8 g a }
+@lilypond[relative=1,fragment]
+\set Staff.implicitTimeSignatureVisibility = #all-invisible
+\times 2/3 { f8 g a }
+@end lilypond
+
+
+@item @code{\grace}
+@tab grace notes
+@tab
+@lilypond[relative=2,fragment]
+\set Staff.implicitTimeSignatureVisibility = #all-invisible
+\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 lyric hyphen
 @tab
-@lilypond[fragment,relative 1]
-\addlyrics \notes { g'4 g }
-  \context Lyrics \lyrics {  twin -- kle }
-@end lilypond 
+@lilypond[fragment,relative=2]
+\set Staff.implicitTimeSignatureVisibility = #all-invisible
+<<
+   { g'1 g }
+  \new Lyrics \lyricsto "" { twin -- kle }
+>>
+@end lilypond
 
-@item @code{\chords @{ c:dim f:maj7 @}}
-@tab chords 
+@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]
+\set Staff.implicitTimeSignatureVisibility = #all-invisible
+\chordmode { c:dim f:maj7 }
+@end lilypond
 
 @item @code{\context ChordNames}
-@tab printing chord names 
+@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]
+\set Staff.implicitTimeSignatureVisibility = #all-invisible
+\context Staff <<{e f} \\ {c d}>>
+@end lilypond
+
+
+@item @code{s4 s8 s16}
+@tab spacer rests
 @tab
-@lilypond[fragment,relative 1]
-  \context ChordNames \chords { c:dim f:maj7 }
-@end lilypond 
 
 @end multitable