Merge branch 'master' into lilypond/translation

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

diff --git a/Documentation/user/staff.itely b/Documentation/user/staff.itely
index de96d52b062dc8e84203863e2eeb375b85224e03..2ed5914aa98eb89f4d388d56b586db0f1b7bc1c8 100644 (file)
--- a/Documentation/user/staff.itely
+++ b/Documentation/user/staff.itely
@@ -591,7 +591,7 @@ example.
 <<
   \new Staff = ossia \with {
     \remove "Time_signature_engraver"
-    \remove "Clef_engraver"
+    \override Clef #'transparent = ##t
     fontSize = #-3
     \override StaffSymbol #'staff-space = #(magstep -3)
     \override StaffSymbol #'thickness = #(magstep -3)
@@ -631,7 +631,7 @@ more information about @code{\RemoveEmptyStaffContext}, see
 <<
   \new Staff = ossia \with {
     \remove "Time_signature_engraver"
-    \remove "Clef_engraver"
+    \override Clef #'transparent = ##t
     fontSize = #-3
     \override StaffSymbol #'staff-space = #(magstep -3)
     \override StaffSymbol #'thickness = #(magstep -3)
@@ -877,31 +877,11 @@ d4 g e c
 
 @c perhaps also an example of how to move it horizontally?
 
-@c TODO add snippet when ready
-@c @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
-@c {changing-the-tempo-without-a-visible-metronome-mark.ly}
-
-To change the tempo in the MIDI output without printing anything,
-make the metronome marking invisible
-
-@example
-\once \override Score.MetronomeMark #'transparent = ##t
-@end example
-
-@c TODO add snippet when ready
-@c @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
-@c {creating-metronome-marks-in-markup-mode.ly}
-
-To print other metronome markings, use these markup commands
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+{changing-the-tempo-without-a-metronome-mark.ly}
 
-@lilypond[verbatim,quote,relative=1]
-c4^\markup {
-  (
-  \smaller \general-align #Y #DOWN \note #"16." #1
-  =
-  \smaller \general-align #Y #DOWN \note #"8" #1
-  ) }
-@end lilypond
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+{creating-metronome-marks-in-markup-mode.ly}
 
 For more details, see @ref{Formatting text}.
 
@@ -961,7 +941,7 @@ instrument names and short instrument names are centered by
 default.  To center multi-line instrument names,
 @code{\center-column} must be used:
 
-@lilypond[verbatim,quote,relative=2]
+@lilypond[verbatim,quote,indent=1.5\cm,relative=2]
 <<
   \new Staff {
     \set Staff.instrumentName = "Flute"
@@ -969,7 +949,7 @@ default.  To center multi-line instrument names,
   }
   \new Staff {
     \set Staff.instrumentName = \markup \center-column {
-      Clarinetti
+      Clarinet
       \line { "in B" \smaller \flat }
     }
     c4 b c2
@@ -987,13 +967,13 @@ these settings, see @ref{Horizontal dimensions}.
 
 @lilypond[verbatim,quote,ragged-right]
 \layout {
-  indent = 2.5\cm
+  indent = 3.0\cm
   short-indent = 1.5\cm
 }
 
 \relative c'' <<
   \new Staff {
-    \set Staff.instrumentName = "Flute"
+    \set Staff.instrumentName = "Alto Flute in G"
     \set Staff.shortInstrumentName = "Fl."
     f2 g4 f \break
     g4 f g2
@@ -1035,10 +1015,10 @@ If an instrument @emph{switch} is needed,
 @code{\instrumentSwitch} to create a detailed list of the
 necessary changes for the switch.  The
 @code{\addInstrumentDefinition} command has two arguments: an
-identifying string, and an alist of context properties and values
-to be used for the instrument.  It must be placed in the toplevel
-scope.  @code{\instrumentSwitch} is used in the music expression
-to declare the instrument switch:
+identifying string, and an association list of context properties
+and values to be used for the instrument.  It must be placed in
+the toplevel scope.  @code{\instrumentSwitch} is used in the music
+expression to declare the instrument switch:
 
 @lilypond[verbatim,quote,ragged-right]
 \addInstrumentDefinition #"contrabassoon"
@@ -1222,7 +1202,7 @@ The previous section explains how to create quotations.  The
 notes into a part.  The syntax is as follows:
 
 @example
-  \cueDuring #@var{partname} #@var{voice} @var{music}
+\cueDuring #@var{partname} #@var{voice} @var{music}
 @end example
 
 This command copies the corresponding measures from @var{partname}
@@ -1258,7 +1238,7 @@ The name of the cued instrument can be printed by setting the
 oboe = \relative c''' {
   g4 r8 e16 f e4 d
 }
-\addQuote oboe { \oboe }
+\addQuote "oboe" { \oboe }
 
 \new Staff \relative c'' <<
   \new CueVoice \with {
@@ -1286,7 +1266,7 @@ from a part but may be restored at a later time.
 flute = \relative c''' {
   r2 cis2 r2 dis2
 }
-\addQuote flute { \flute }
+\addQuote "flute" { \flute }
 
 \new Voice \relative c'' {
   \killCues {