Merge remote-tracking branch 'origin/master' into translation

[lilypond.git] / Documentation / notation / chords.itely

diff --git a/Documentation/notation/chords.itely b/Documentation/notation/chords.itely
index 80f716bd1b82aed00cfca5a1447c0358c250aa91..8ba8009eddae37244afd5532aff7689ef1a4a60a 100644 (file)
--- a/Documentation/notation/chords.itely
+++ b/Documentation/notation/chords.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.17.6"
+@c \version "2.17.30"
 
 
 @node Chord notation
@@ -90,25 +90,6 @@ Snippets:
 Predefined shorthands for articulations and ornaments cannot be used
 on notes in chord mode, see @ref{Articulations and ornamentations}.
 
-When chord mode and note mode are mixed in sequential music, and
-chord mode comes first, the note mode will create a new @code{Staff}
-context:
-
-@lilypond[verbatim,quote,ragged-right,relative=1]
-\chordmode { c2 f }
-<c e g>2 <g' b d>
-@end lilypond
-
-@noindent
-To avoid this behavior, explicitly create the @code{Staff} context:
-
-@lilypond[verbatim,quote,ragged-right,relative=1]
-\new Staff {
-  \chordmode { c2 f }
-  <c e g>2  <g' b d>
-}
-@end lilypond
-
 
 @node Common chords
 @unnumberedsubsubsec Common chords
@@ -168,7 +149,7 @@ The default action; produces a major triad.
 @tab
 @lilypond[line-width=4\cm, noragged-right]
 \chordmode {
-  \override Staff.TimeSignature.stencil = ##f
+  \omit Staff.TimeSignature
   c1
 }
 @end lilypond
@@ -180,7 +161,7 @@ The minor chord.  This modifier lowers the 3rd.
 @tab
 @lilypond[line-width=4\cm, noragged-right]
 \chordmode {
-  \override Staff.TimeSignature.stencil = ##f
+  \omit Staff.TimeSignature
   c1:m c:m7
 }
 @end lilypond
@@ -194,7 +175,7 @@ present) the 7th step.
 @tab
 @lilypond[line-width=4\cm, noragged-right]
 \chordmode {
-  \override Staff.TimeSignature.stencil = ##f
+  \omit Staff.TimeSignature
   c1:dim c:dim7
 }
 @end lilypond
@@ -206,7 +187,7 @@ The augmented chord.  This modifier raises the 5th step.
 @tab
 @lilypond[line-width=4\cm, noragged-right]
 \chordmode {
-  \override Staff.TimeSignature.stencil = ##f
+  \omit Staff.TimeSignature
   c1:aug
 }
 @end lilypond
@@ -220,7 +201,7 @@ to create a major triad.
 @tab
 @lilypond[line-width=4\cm, noragged-right]
 \chordmode {
-  \override Staff.TimeSignature.stencil = ##f
+  \omit Staff.TimeSignature
   c1:maj c:maj7
 }
 @end lilypond
@@ -360,7 +341,7 @@ chord) and added bass notes can be specified by appending
 
 @lilypond[quote,ragged-right,verbatim]
 \chordmode {
-  c1 c/g c/f
+  c'1 c'/e c'/f
 }
 @end lilypond
 
@@ -371,7 +352,7 @@ moved as part of an inversion, by using @code{/+}@var{pitch}.
 
 @lilypond[quote,ragged-right,verbatim]
 \chordmode {
-  c1 c/g c/+g
+  c'1 c'/g c'/+e
 }
 @end lilypond
 
@@ -395,16 +376,6 @@ interpreted last.
 \chordmode { c1:5.5-.5+ }
 @end lilypond
 
-Only the second inversion can be created by adding a bass
-note.  The first inversion requires changing the root of
-the chord.
-
-@lilypond[quote,ragged-right,verbatim]
-\chordmode {
-  c'1: c':/g e:6-3-^5 e:m6-^5
-}
-@end lilypond
-
 
 @node Displaying chords
 @subsection Displaying chords
@@ -438,21 +409,20 @@ Chords can be entered as simultaneous notes or through the use of
 chord mode.  The displayed chord name will be the same, regardless
 of the mode of entry, unless there are inversions or added bass notes:
 
-@lilypond[verbatim,quote,relative=1]
+@lilypond[verbatim,quote]
+chordmusic = \relative c' {
+  <c e g>2 <f bes c>
+  <f c' e g>1
+  \chordmode {
+    c2 f:sus4 c1:/f
+  }
+}
 <<
   \new ChordNames {
-    <c e g>2  <f bes c>
-    <f c' e g>1
-    \chordmode {
-      c2 f:sus4 c1:/f
-    }
+    \chordmusic
   }
   {
-    <c e g>2  <f bes c>
-    <f, c' e g>1
-    \chordmode {
-      c2 f:sus4 c1:/f
-    }
+    \chordmusic
   }
 >>
 @end lilypond
@@ -484,7 +454,7 @@ Rests passed to a @code{ChordNames} context will cause the
 @funindex{\chords}
 
 @code{\chords @{ @dots{} @}} is a shortcut notation for
-@code{\new ChordNames @{ \chordmode @{ @dots{} @}}.
+@code{\new ChordNames @{ \chordmode @{ @dots{} @} @}}.
 
 @lilypond[verbatim,quote,ragged-right]
 \chords {