Added music examples to common chords table

diff --git a/Documentation/user/chords.itely b/Documentation/user/chords.itely
index dbb1f0084da9ac4dfb4a4c4ea40f2e3a58ffbdb7..14983289cc99e1f3af0d2ee333d5feb424dcb2d9 100644 (file)
--- a/Documentation/user/chords.itely
+++ b/Documentation/user/chords.itely
@@ -138,35 +138,94 @@ Seventh chords can be created:
 @funindex m
 
 The table belows shows the actions of the quality modifiers on
-triads and seventh chords.
+triads and seventh chords.  A more complete table of modifier usage
+is found at @ref{Common chord modifiers}.
 
-@table @code
+@c @table @code
+@multitable @columnfractions .2 .5 .2
 
-@item m
+@item
+@b{Modifier}
+@tab
+@b{Action}
+@tab
+@b{Example}
+
+@item
+None
+@tab
+The default action; produces a major triad.
+@tab
+@lilypond[line-width=4\cm, noragged-right]
+\chordmode {
+  \override Staff.TimeSignature #'stencil = ##f
+  c1
+}
+@end lilypond
+
+@item 
+m
+@tab
 The minor chord.  This modifier lowers the 3rd and (if present) the
 7th step.
+@tab
+@lilypond[line-width=4\cm, noragged-right]
+\chordmode {
+  \override Staff.TimeSignature #'stencil = ##f
+  c1:m c:m7
+}
+@end lilypond
 
-@item dim
+
+@item 
+dim
+@tab
 The diminished chord.  This modifier lowers the 3rd, 5th and (if
 present) the 7th step.
+@tab
+@lilypond[line-width=4\cm, noragged-right]
+\chordmode {
+  \override Staff.TimeSignature #'stencil = ##f
+  c1:dim c:dim7
+}
+@end lilypond
 
-@item aug
+@item 
+aug
+@tab
 The augmented chord.  This modifier raises the 5th step.
+@tab
+@lilypond[line-width=4\cm, noragged-right]
+\chordmode {
+  \override Staff.TimeSignature #'stencil = ##f
+  c1:aug
+}
+@end lilypond
 
-@item maj
+@item 
+maj, maj7
+@tab
 The major 7th chord.  This modifier adds a raised 7th step.  The
 @code{7} following @code{maj} is optional.  Do NOT use this modifier
 to create a major triad.
+@tab
+@lilypond[line-width=4\cm, noragged-right]
+\chordmode {
+  \override Staff.TimeSignature #'stencil = ##f
+  c1:maj c:maj7
+}
+@end lilypond
 
-@end table
+@end multitable
 
-@c TODO -- perhaps add warning about c and c:maj being different, while
-@c   c:maj and c:maj7 are the same
 
 @seealso
 
+Notation Reference:
+@ref{Common chord modifiers}.
+
 Snippets:
-@rlsr{Chords}
+@rlsr{Chords}.
 
 @node Extended and altered chords
 @unnumberedsubsubsec Extended and altered chords

diff --git a/Documentation/user/notation-appendices.itely b/Documentation/user/notation-appendices.itely
index 0158773c578ae7f6a500a044a5113369f033edd0..b47dd2ece6e8f65867954610760f5a351dd0b189 100644 (file)
--- a/Documentation/user/notation-appendices.itely
+++ b/Documentation/user/notation-appendices.itely
@@ -63,7 +63,7 @@ Major third, perfect fifth
 @tab
 @code{5} or nothing
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
   c1:5
 }
@@ -76,7 +76,7 @@ Minor third, perfect fifth
 @tab
 @code{m} or @code{m5}
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
   c1:m
 }
@@ -89,7 +89,7 @@ Major third, augmented fifth
 @tab
 @code{aug}
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
   c1:aug
 }
@@ -102,7 +102,7 @@ Minor third, diminished fifth
 @tab
 @code{dim}
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
   c1:dim
 }
@@ -115,7 +115,7 @@ Major triad, minor seventh
 @tab
 @code{7}
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
   c1:7
 }
@@ -128,7 +128,7 @@ Major triad, major seventh
 @tab
 @code{maj7} or @code{maj}
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
   c1:maj7
 }
@@ -141,7 +141,7 @@ Minor triad, minor seventh
 @tab
 @code{m7}
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
   c1:m7
 }
@@ -154,7 +154,7 @@ Diminished triad, diminished seventh
 @tab
 @code{dim7}
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
   c1:dim7
 }
@@ -167,7 +167,7 @@ Augmented triad, minor seventh
 @tab
 @code{aug7}
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
   c1:aug7
 }
@@ -180,7 +180,7 @@ Diminished triad, minor seventh
 @tab
 @code{dim5m7}
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
   c1:dim5m7
 }
@@ -193,7 +193,7 @@ Minor triad, major seventh
 @tab
 @code{7m5}
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
   c1:7m5
 }
@@ -206,7 +206,7 @@ Major triad, sixth
 @tab
 @code{6}
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
   c1:6
 }
@@ -219,7 +219,7 @@ Minor triad, sixth
 @tab
 @code{m6}
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
   c1:m6
 }
@@ -232,7 +232,7 @@ Dominant seventh, major ninth
 @tab
 @code{9}
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
   c1:9
 }
@@ -245,7 +245,7 @@ TODO
 @tab
 @code{maj9}
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
   c1:maj9
 }
@@ -258,7 +258,7 @@ TODO
 @tab
 @code{m9}
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
   c1:m9
 }
@@ -271,7 +271,7 @@ Dominant ninth, perfect eleventh
 @tab
 @code{11}
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
   c1:11
 }
@@ -284,7 +284,7 @@ TODO
 @tab
 @code{maj11}
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
   c1:maj11
 }
@@ -297,7 +297,7 @@ TODO
 @tab
 @code{m11}
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
   c1:m11
 }
@@ -310,7 +310,7 @@ Dominant eleventh, major thirteenth
 @tab
 @code{13.11}
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
   c1:13.11
 }
@@ -323,7 +323,7 @@ TODO
 @tab
 @code{maj13.11}
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
   c1:maj13.11
 }
@@ -336,7 +336,7 @@ TODO
 @tab
 @code{m13.11}
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
   c1:m13.11
 }
@@ -349,7 +349,7 @@ TODO
 @tab
 @code{sus2}
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
   c1:sus2
 }
@@ -362,7 +362,7 @@ TODO
 @tab
 @code{sus4}
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
   c1:sus4
 }