Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / Documentation / user / cheatsheet.itely

diff --git a/Documentation/user/cheatsheet.itely b/Documentation/user/cheatsheet.itely
index 564f6c1863e2470c222d26d362a571e286c5cd7d..1bef3ccfebc123b77783438034da6b9f50f7c11d 100644 (file)
--- a/Documentation/user/cheatsheet.itely
+++ b/Documentation/user/cheatsheet.itely
@@ -1,4 +1,11 @@
-@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.
@@ -7,7 +14,7 @@
 @appendix Cheat sheet
 
 
-@multitable @columnfractions  .3 .3 .4  
+@multitable @columnfractions .35 .3 .35
 
 @item @b{Syntax}
 @tab @b{Description}
@@ -16,38 +23,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=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=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
@@ -57,8 +64,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
@@ -69,15 +76,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
@@ -86,7 +93,7 @@ d ~ d
 @item @code{\key es \major }
 @tab key signature
 @tab
-@lilypond[notime]
+@lilypond[notime,fragment]
 \clef treble
 \key es \major
 s4 
@@ -95,7 +102,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'
@@ -104,7 +111,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,
@@ -116,7 +123,7 @@ c c,
 @tab
 @lilypond[fragment,relative=2]
 \set Score.timing = ##f
-\set Staff.TimeSignature = \turnOff
+\set Staff.implicitTimeSignatureVisibility = #all-invisible
 \set Staff.autoBeaming = ##f
 c( d e)
 @end lilypond
@@ -127,9 +134,9 @@ c( d e)
 @tab
 @lilypond[fragment,relative=2]
 \set Score.timing = ##f
-\set Staff.TimeSignature = \turnOff
+\set Staff.implicitTimeSignatureVisibility = #all-invisible
 \set Staff.autoBeaming = ##f
-c\(  c( d) e\)
+c\( c( d) e\)
 @end lilypond
 
 
@@ -138,7 +145,7 @@ c\(  c( d) e\)
 @tab
 @lilypond[fragment,relative=2]
 \set Score.timing = ##f
-\set Staff.TimeSignature = \turnOff
+\set Staff.implicitTimeSignatureVisibility = #all-invisible
 \set Staff.autoBeaming = ##f
 a8-[ b-]
 @end lilypond
@@ -157,7 +164,7 @@ a8-[ b-]
 @tab articulations
 @tab
 @lilypond[fragment,relative=2]
-\set Staff.TimeSignature = \turnOff
+\set Staff.implicitTimeSignatureVisibility = #all-invisible
 c-> c-.
 @end lilypond
 
@@ -166,19 +173,19 @@ c-> c-.
 @tab dynamics
 @tab
 @lilypond[fragment,relative=2]
-\set Staff.TimeSignature = \turnOff
+\set Staff.implicitTimeSignatureVisibility = #all-invisible
 c\mf c\sfz
 @end lilypond
 
 
-@item @code{a\< a \!a}
+@item @code{a\< a a\!}
 @tab crescendo
 @tab
 @lilypond[fragment,relative=2]
 \set Score.timing = ##f
-\set Staff.TimeSignature = \turnOff
+\set Staff.implicitTimeSignatureVisibility = #all-invisible
 \set Staff.autoBeaming = ##f
-a\< a \!a
+a\< a a\!
 @end lilypond
 
 @item @code{a\> a a\!}
@@ -186,7 +193,7 @@ a\< a \!a
 @tab
 @lilypond[fragment,relative=2]
 \set Score.timing = ##f
-\set Staff.TimeSignature = \turnOff
+\set Staff.implicitTimeSignatureVisibility = #all-invisible
 \set Staff.autoBeaming = ##f
 a\> a a\!
 @end lilypond
@@ -224,17 +231,17 @@ f8 c2 d e
 \context Voice { \grace b16 c4 }
 @end lilypond
 
-@item @code{\lyrics @{ twinkle @}}
+@item @code{\lyricmode @{ twinkle @}}
 @tab entering lyrics
 @tab
+twinkle
 
 
 @item @code{\new Lyrics}
 @tab printing lyrics
 @tab
-twinkle
 @lilypond[fragment]
-\new Lyrics \lyrics { twinkle }
+\new Lyrics \lyricmode { twinkle }
 @end lilypond
 
 @item @code{twin -- kle}
@@ -242,26 +249,26 @@ twinkle
 @tab
 @lilypond[fragment,relative=2]
 <<
-  \notes { g'4 g }
-  \lyricsto "" \new Lyrics \lyrics { twin -- kle }
+   { 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=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@}>>}
+@item @code{<<@{e f@} \\ @{c d@}>>}
 @tab polyphony
 @tab
 @lilypond[fragment,relative=2]