Merge with master

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

diff --git a/Documentation/user/cheatsheet.itely b/Documentation/user/cheatsheet.itely
index ad15ea38d84f1ced09ee449253cf70a6fccb677c..1bef3ccfebc123b77783438034da6b9f50f7c11d 100644 (file)
--- a/Documentation/user/cheatsheet.itely
+++ b/Documentation/user/cheatsheet.itely
@@ -1,5 +1,11 @@
-\version "2.3.16"
-@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.
@@ -8,7 +14,7 @@
 @appendix Cheat sheet
 
 
-@multitable @columnfractions  .3 .3 .4  
+@multitable @columnfractions .35 .3 .35
 
 @item @b{Syntax}
 @tab @b{Description}
@@ -19,7 +25,7 @@
 @tab
 @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
 
@@ -27,7 +33,7 @@ c1 c2 c8 c16
 @tab augmentation dots
 @tab
 @lilypond[fragment,relative=2,notime]
-\set Staff.Clef = \turnOff
+\override Staff.Clef #'break-visibility = #all-invisible
 c4. c4..  
 @end lilypond
 
@@ -59,7 +65,7 @@ s4_" "
 @tab time signature
 @tab
 @lilypond[fragment]
-\override Staff.Clef   #'transparent = ##t 
+\override Staff.Clef #'transparent = ##t 
 \time 3/4
 s4_" "
 \time 4/4
@@ -71,7 +77,7 @@ s16_" "
 @tab rest 
 @tab
 @lilypond[relative=2,notime,fragment]
-\set Staff.Clef = \turnOff
+\override Staff.Clef #'break-visibility = #all-invisible
 r4 r8
 @end lilypond
 
@@ -117,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
@@ -128,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
 
 
@@ -139,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
@@ -158,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
 
@@ -167,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\!}
@@ -187,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
@@ -228,12 +234,12 @@ f8 c2 d e
 @item @code{\lyricmode @{ twinkle @}}
 @tab entering lyrics
 @tab
+twinkle
 
 
 @item @code{\new Lyrics}
 @tab printing lyrics
 @tab
-twinkle
 @lilypond[fragment]
 \new Lyrics \lyricmode { twinkle }
 @end lilypond
@@ -243,8 +249,8 @@ twinkle
 @tab
 @lilypond[fragment,relative=2]
 <<
-   { g'4 g }
-  \lyricsto "" \new Lyrics { twin -- kle }
+   { g'1 g }
+  \new Lyrics \lyricsto "" { twin -- kle }
 >> 
 @end lilypond
 
@@ -259,10 +265,10 @@ twinkle
 @tab printing chord names 
 @tab
 @lilypond[fragment,relative=2]
-\context ChordNames \chordmode { 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]