Imported Upstream version 2.18.0

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

diff --git a/Documentation/notation/chords.itely b/Documentation/notation/chords.itely
index 753d82bb3d4b781096701ebfcb1a7a11ad58b555..88c08e19616a41480fa3fe27887da245441ea15b 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.16.0"
+@c \version "2.17.30"
 
 
 @node Chord notation
@@ -168,7 +168,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 +180,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 +194,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 +206,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 +220,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
@@ -438,21 +438,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
@@ -483,8 +482,8 @@ Rests passed to a @code{ChordNames} context will cause the
 
 @funindex{\chords}
 
-@code{\chords @{ ... @}} is a shortcut notation for
-@code{\new ChordNames @{ \chordmode @{ ... @} @}}.
+@code{\chords @{ @dots{} @}} is a shortcut notation for
+@code{\new ChordNames @{ \chordmode @{ @dots{} @}}.
 
 @lilypond[verbatim,quote,ragged-right]
 \chords {
@@ -563,7 +562,7 @@ Jazz notation are shown on the chart in @ref{Chord name chart}.
 
 In addition to the different naming systems, different note names
 are used for the root in different languages.  The predefined
-variables @code{\germanChords}, @code{\semiGermanChords},
+commands @code{\germanChords}, @code{\semiGermanChords},
 @code{\italianChords} and @code{\frenchChords} set these variables.
 The effect is demonstrated here:
 
@@ -831,8 +830,8 @@ entry of bass figures, and there is a context named
 @code{BassFigure} objects.  Figured bass can also be displayed
 in @code{Staff} contexts.
 
-@code{\figures@{ ... @}} is a shortcut notation for
-@code{\new FiguredBass @{ \figuremode @{ ... @} @}}.
+@code{\figures@{ @dots{} @}} is a shortcut notation for
+@code{\new FiguredBass @{ \figuremode @{ @dots{} @} @}}.
 
 
 Although the support for figured bass may superficially resemble chord
@@ -1077,13 +1076,13 @@ figures is adjusted automatically.
 
 @lilypond[verbatim,ragged-right,quote]
 <<
-  \new Staff = myStaff
+  \new Staff = "myStaff"
   \figuremode {
     <4>4 <10 6>8 s8
     <6 4>4 <6 4>
   }
   %% Put notes on same Staff as figures
-  \context Staff = myStaff
+  \context Staff = "myStaff"
   {
     \clef bass
     c4 c'8 r8 c4 c'
@@ -1097,14 +1096,14 @@ or below the staff.
 
 @lilypond[verbatim,ragged-right,quote]
 <<
-  \new Staff = myStaff
+  \new Staff = "myStaff"
   \figuremode {
     <4>4 <10 6>8 s8
     \bassFigureStaffAlignmentDown
     <6 4>4 <6 4>
   }
   %% Put notes on same Staff as figures
-  \context Staff = myStaff
+  \context Staff = "myStaff"
   {
     \clef bass
     c4 c'8 r8 c4 c'
@@ -1162,31 +1161,3 @@ the bass line.
   }
 >>
 @end lilypond
-
-When using extender lines, adjacent figures with the same number in
-a different figure location can cause the figure positions to invert.
-
-@lilypond[verbatim,ragged-right,quote,relative=1]
-<<
-  { fis4 g g, e' }
-  \figures {
-    \bassFigureExtendersOn
-    <6 5>4 <5\! 4> < 5 _!> <6>
-  }
->>
-@end lilypond
-
-To avoid this problem, simply turn on extenders after the figure that
-begins the extender line and turn them off at the end of the extender line.
-
-@lilypond[verbatim,ragged-right,quote,relative=1]
-<<
-  { fis4 g g, e' }
-  \figures {
-    <6 5>4 <5 4>
-    \bassFigureExtendersOn
-    < 5 _!>4 <6>
-    \bassFigureExtendersOff
-  }
->>
-@end lilypond