Merge remote branch 'origin/release/unstable'

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

diff --git a/Documentation/notation/chords.itely b/Documentation/notation/chords.itely
index a95b74253b8e3e6d7bf742d51806df7c607dbdd0..581067eb86b417cbae19583e7a86e4398a53b3a1 100644 (file)
--- a/Documentation/notation/chords.itely
+++ b/Documentation/notation/chords.itely
@@ -63,7 +63,7 @@ found at @ref{Input modes}.
 Chords entered using chord mode are music elements, and can be
 transposed just like chords entered using simultaneous music.
 @code{\chordmode} is absolute, as @code{\relative} has no effect
-on @code{chordmode} blocks. However, in @code{\chordmode} the
+on @code{chordmode} blocks.  However, in @code{\chordmode} the
 absolute pitches are one octave higher than in note mode.
 
 Chord mode and note mode can be mixed in sequential music:
@@ -90,9 +90,12 @@ Snippets:
 
 @knownissues
 
+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.
+context:
 
 @lilypond[verbatim,quote,ragged-right,relative=1]
 \chordmode { c2 f }
@@ -474,7 +477,7 @@ Rests passed to a @code{ChordNames} context will cause the
     g1
     c1
   }
-  \new Score \chordmode {
+  \chordmode {
     c1
     r1
     g1
@@ -549,7 +552,7 @@ properly if entered using simultaneous music.
 
 There is no unique system for naming chords.  Different musical
 traditions use different names for the same set of chords.  There
-are also different symbols displayed for a given chord name.   The
+are also different symbols displayed for a given chord name.  The
 names and symbols displayed for chord names are customizable.
 
 @cindex jazz chords
@@ -575,6 +578,20 @@ The effect is demonstrated here:
 
 @lilypondfile[ragged-right]{chord-names-languages.ly}
 
+
+@funindex chordNameLowercaseMinor
+
+German songbooks may indicate minor chords as lowercase letters,
+without any @var{m} suffix.  This can be obtained by setting the
+@code{chordNameLowercaseMinor} property:
+
+@lilypond[verbatim,quote,ragged-right, relative=1]
+\chords {
+  \set chordNameLowercaseMinor = ##t
+  c2 d:m e:m f
+}
+@end lilypond
+
 If none of the existing settings give the desired output, the chord
 name display can be tuned through the following properties.
 
@@ -595,7 +612,7 @@ this property.
 @item majorSevenSymbol
 
 This property contains the markup object used to follow the output
-of @code{chordRootNamer} to identify a major 7 chord. Predefined
+of @code{chordRootNamer} to identify a major 7 chord.  Predefined
 options are @code{whiteTriangleMarkup} and
 @code{blackTriangleMarkup}.
 
@@ -606,7 +623,7 @@ options are @code{whiteTriangleMarkup} and
 When the chord name contains additional pitches other than the root
 (e.g., an added bass note), this function is used to print the
 additional pitch.  By default the pitch is printed using
-@code{chordRootNamer}. The @code{chordNoteNamer} property can be set
+@code{chordRootNamer}.  The @code{chordNoteNamer} property can be set
 to a specialized function to change this behavior.  For example, the
 bass note can be printed in lower case.