X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fnotation%2Fnotation-appendices.itely;h=23aef2f86519726312397db7420dcec1229d0800;hb=1f3579b543de896b60d9c11f7a9d51b15612f34c;hp=5bc7c81948a55205fcb5f5d6ac255b01b3bdf1ef;hpb=fb6f94387f2431e59e84f5b79e523c56dfe59f7f;p=lilypond.git

diff --git a/Documentation/notation/notation-appendices.itely b/Documentation/notation/notation-appendices.itely
index 5bc7c81948..23aef2f865 100644
--- a/Documentation/notation/notation-appendices.itely
+++ b/Documentation/notation/notation-appendices.itely
@@ -23,6 +23,7 @@
 * List of colors::
 * The Feta font::
 * Note head styles::
+* Clef styles::
 * Text markup commands::
 * Text markup list commands::
 * List of special characters::
@@ -51,372 +52,447 @@ names, along with the pitches they represent.
 @node Common chord modifiers
 @appendixsec Common chord modifiers
 
-The following table shows chord modifiers that can be used in
-@code{\chordmode} to generate standard chord structures.
+The following table shows chord modifiers that can be used to generate
+standard chord structures.
 
-@multitable @columnfractions .2 .3 .2 .2
+@multitable @columnfractions .2 .25 .2 .15 .2
 
 @item
-@b{Chord type}
+@b{Type}
 @tab
-@b{Intervals}
+@b{Interval}
 @tab
-@b{Modifier(s)}
+@b{Modifier}
 @tab
 @b{Example}
+@tab
+@b{Output}
 
 
 @item
 Major
 @tab
-Major third, perfect fifth
+Major third, @*perfect fifth
 @tab
 @code{5} or nothing
 @tab
-@lilypond[line-width=2.8\cm,noragged-right, notime]
-\chordmode {
-  c1:5
-}
+@code{c1:5}
+@tab
+@lilypond[line-width=2.1\cm,notime]
+<<
+  \chords { c1:5 }
+  \chordmode { c1:5 }
+>>
 @end lilypond
 
 @item
 Minor
 @tab
-Minor third, perfect fifth
+Minor third, @*perfect fifth
 @tab
 @code{m} or @code{m5}
 @tab
-@lilypond[line-width=2.8\cm,noragged-right, notime]
-\chordmode {
-  c1:m
-}
+@code{c1:m}
+@tab
+@lilypond[line-width=2.1\cm,noragged-right,notime]
+<<
+  \chords { c1:m }
+  \chordmode { c1:m }
+>>
 @end lilypond
 
 @item
 Augmented
 @tab
-Major third, augmented fifth
+Major third, @*augmented fifth
 @tab
 @code{aug}
 @tab
-@lilypond[line-width=2.8\cm,noragged-right, notime]
-\chordmode {
-  c1:aug
-}
+@code{c1:aug}
+@tab
+@lilypond[line-width=2.1\cm,noragged-right,notime]
+<<
+  \chords { c1:aug }
+  \chordmode { c1:aug }
+>>
 @end lilypond
 
 @item
 Diminished
 @tab
-Minor third, diminished fifth
+Minor third, @*diminished fifth
 @tab
 @code{dim}
 @tab
-@lilypond[line-width=2.8\cm,noragged-right, notime]
-\chordmode {
-  c1:dim
-}
+@code{c1:dim}
+@tab
+@lilypond[line-width=2.1\cm,noragged-right,notime]
+<<
+  \chords { c1:dim }
+  \chordmode { c1:dim }
+>>
 @end lilypond
 
 @item
 Dominant seventh
 @tab
-Major triad, minor seventh
+Major triad, @*minor seventh
 @tab
 @code{7}
 @tab
-@lilypond[line-width=2.8\cm,noragged-right, notime]
-\chordmode {
-  c1:7
-}
+@code{c1:7}
+@tab
+@lilypond[line-width=2.1\cm,noragged-right,notime]
+<<
+  \chords { c1:7 }
+  \chordmode { c1:7 }
+>>
 @end lilypond
 
 @item
 Major seventh
 @tab
-Major triad, major seventh
+Major triad, @*major seventh
 @tab
 @code{maj7} or @code{maj}
 @tab
-@lilypond[line-width=2.8\cm,noragged-right, notime]
-\chordmode {
-  c1:maj7
-}
+@code{c1:maj7}
+@tab
+@lilypond[line-width=2.1\cm,noragged-right,notime]
+<<
+  \chords { c1:maj7 }
+  \chordmode { c1:maj7 }
+>>
 @end lilypond
 
 @item
 Minor seventh
 @tab
-Minor triad, minor seventh
+Minor triad, @*minor seventh
 @tab
 @code{m7}
 @tab
-@lilypond[line-width=2.8\cm,noragged-right, notime]
-\chordmode {
-  c1:m7
-}
+@code{c1:m7}
+@tab
+@lilypond[line-width=2.1\cm,noragged-right,notime]
+<<
+  \chords { c1:m7 }
+  \chordmode { c1:m7 }
+>>
 @end lilypond
 
 @item
 Diminished seventh
 @tab
-Diminished triad, diminished seventh
+Diminished triad, @*diminished seventh
 @tab
 @code{dim7}
 @tab
-@lilypond[line-width=2.8\cm,noragged-right, notime]
-\chordmode {
-  c1:dim7
-}
+@code{c1:dim7}
+@tab
+@lilypond[line-width=2.1\cm,noragged-right,notime]
+<<
+  \chords { c1:dim7}
+  \chordmode { c1:dim7 }
+>>
 @end lilypond
 
 @item
 Augmented seventh
 @tab
-Augmented triad, minor seventh
+Augmented triad, @*minor seventh
 @tab
 @code{aug7}
 @tab
-@lilypond[line-width=2.8\cm,noragged-right, notime]
-\chordmode {
-  c1:aug7
-}
+@code{c1:aug}
+@tab
+@lilypond[line-width=2.1\cm,noragged-right,notime]
+<<
+  \chords { c1:aug7 }
+  \chordmode { c1:aug7 }
+>>
 @end lilypond
 
 @item
 Half-diminished seventh
 @tab
-Diminished triad, minor seventh
+Diminished triad, @*minor seventh
 @tab
 @code{m7.5-}
 @tab
-@lilypond[line-width=2.8\cm,noragged-right, notime]
-\chordmode {
-  c1:m7.5-
-}
+@code{c1:m7.5-}
+@tab
+@lilypond[line-width=2.1\cm,noragged-right,notime]
+<<
+  \chords { c1:m7.5- }
+  \chordmode { c1:m7.5- }
+>>
 @end lilypond
 
 @item
 Minor-major seventh
 @tab
-Minor triad, major seventh
+Minor triad, @*major seventh
 @tab
 @code{m7+}
 @tab
-@lilypond[line-width=2.8\cm,noragged-right, notime]
-\chordmode {
-  c1:m7+
-}
+@code{m7+}
+@tab
+@lilypond[line-width=2.1\cm,noragged-right,notime]
+<<
+  \chords { c1:m7+ }
+  \chordmode { c1:m7+ }
+>>
 @end lilypond
 
 @item
 Major sixth
 @tab
-Major triad, sixth
+Major triad, @*sixth
 @tab
 @code{6}
 @tab
-@lilypond[line-width=2.8\cm,noragged-right, notime]
-\chordmode {
-  c1:6
-}
+@code{c1:6}
+@tab
+@lilypond[line-width=2.1\cm,noragged-right,notime]
+<<
+  \chords { c1:6 }
+  \chordmode { c1:6 }
+>>
 @end lilypond
 
 @item
 Minor sixth
 @tab
-Minor triad, sixth
+Minor triad, @*sixth
 @tab
 @code{m6}
 @tab
-@lilypond[line-width=2.8\cm,noragged-right, notime]
-\chordmode {
-  c1:m6
-}
+@code{c1:m6}
+@tab
+@lilypond[line-width=2.1\cm,noragged-right,notime]
+<<
+  \chords { c1:m6 }
+  \chordmode { c1:m6 }
+>>
 @end lilypond
 
 @item
 Dominant ninth
 @tab
-Dominant seventh, major ninth
+Dominant seventh, @*major ninth
 @tab
 @code{9}
 @tab
-@lilypond[line-width=2.8\cm,noragged-right, notime]
-\chordmode {
-  c1:9
-}
+@code{c1:9}
+@tab
+@lilypond[line-width=2.1\cm,noragged-right,notime]
+<<
+  \chords { c1:9 }
+  \chordmode { c1:9 }
+>>
 @end lilypond
 
 @item
 Major ninth
 @tab
-Major seventh, major ninth
+Major seventh, @*major ninth
 @tab
 @code{maj9}
 @tab
-@lilypond[line-width=2.8\cm,noragged-right, notime]
-\chordmode {
-  c1:maj9
-}
+@code{c1:maj9}
+@tab
+@lilypond[line-width=2.1\cm,noragged-right,notime]
+<<
+  \chords { c1:maj9 }
+  \chordmode { c1:maj9 }
+>>
 @end lilypond
 
 @item
 Minor ninth
 @tab
-Minor seventh, major ninth
+Minor seventh, @*major ninth
 @tab
 @code{m9}
 @tab
-@lilypond[line-width=2.8\cm,noragged-right, notime]
-\chordmode {
-  c1:m9
-}
+@code{c1:m9}
+@tab
+@lilypond[line-width=2.1\cm,noragged-right,notime]
+<<
+  \chords { c1:m9 }
+  \chordmode { c1:m9 }
+>>
 @end lilypond
 
 @item
 Dominant eleventh
 @tab
-Dominant ninth, perfect eleventh
+Dominant ninth, @*perfect eleventh
 @tab
 @code{11}
 @tab
-@lilypond[line-width=2.8\cm,noragged-right, notime]
-\chordmode {
-  c1:11
-}
+@code{c1:11}
+@tab
+@lilypond[line-width=2.1\cm,noragged-right,notime]
+<<
+  \chords { c1:11 }
+  \chordmode { c1:11 }
+>>
 @end lilypond
 
 @item
 Major eleventh
 @tab
-Major ninth, perfect eleventh
+Major ninth, @*perfect eleventh
 @tab
 @code{maj11}
 @tab
-@lilypond[line-width=2.8\cm,noragged-right, notime]
-\chordmode {
-  c1:maj11
-}
+@code{c1:maj11}
+@tab
+@lilypond[line-width=2.1\cm,noragged-right,notime]
+<<
+  \chords { c1:maj11 }
+  \chordmode { c1:maj11 }
+>>
 @end lilypond
 
 @item
 Minor eleventh
 @tab
-Minor ninth, perfect eleventh
+Minor ninth, @*perfect eleventh
 @tab
 @code{m11}
 @tab
-@lilypond[line-width=2.8\cm,noragged-right, notime]
-\chordmode {
-  c1:m11
-}
+@code{c1:m11}
+@tab
+@lilypond[line-width=2.1\cm,noragged-right,notime]
+<<
+  \chords { c1:m11 }
+  \chordmode { c1:m11 }
+>>
 @end lilypond
 
 @item
 Dominant thirteenth
 @tab
-Dominant ninth, major thirteenth
+Dominant ninth, @*major thirteenth
 @tab
 @code{13}
 @tab
-@lilypond[line-width=2.8\cm,noragged-right, notime]
-\chordmode {
-  c1:13
-}
+@code{c1:13}
+@tab
+@lilypond[line-width=2.1\cm,noragged-right,notime]
+<<
+  \chords { c1:13 }
+  \chordmode { c1:13 }
+>>
 @end lilypond
 
 @item
 Dominant thirteenth
 @tab
-Dominant eleventh, major thirteenth
+Dominant eleventh, @*major thirteenth
 @tab
 @code{13.11}
 @tab
-@lilypond[line-width=2.8\cm,noragged-right, notime]
-\chordmode {
-  c1:13.11
-}
+@code{c1:13.11}
+@tab
+@lilypond[line-width=2.1\cm,noragged-right,notime]
+<<
+  \chords{ c1:13.11 }
+  \chordmode { c1:13.11 }
+>>
 @end lilypond
 
 @item
 Major thirteenth
 @tab
-Major eleventh, major thirteenth
+Major eleventh, @*major thirteenth
 @tab
 @code{maj13.11}
 @tab
-@lilypond[line-width=2.8\cm,noragged-right, notime]
-\chordmode {
-  c1:maj13.11
-}
+@code{c1:maj13.11}
+@tab
+@lilypond[line-width=2.1\cm,noragged-right,notime]
+<<
+  \chords { c1:maj13.11 }
+  \chordmode { c1:maj13.11 }
+>>
 @end lilypond
 
 @item
 Minor thirteenth
 @tab
-Minor eleventh, major thirteenth
+Minor eleventh, @*major thirteenth
 @tab
 @code{m13.11}
 @tab
-@lilypond[line-width=2.8\cm,noragged-right, notime]
-\chordmode {
-  c1:m13.11
-}
+@code{c1:m13.11}
+@tab
+@lilypond[line-width=2.1\cm,noragged-right,notime]
+<<
+  \chords { c1:m13.11 }
+  \chordmode { c1:m13.11 }
+>>
 @end lilypond
 
 @item
 Suspended second
 @tab
-Major second, perfect fifth
+Major second, @*perfect fifth
 @tab
 @code{sus2}
 @tab
-@lilypond[line-width=2.8\cm,noragged-right, notime]
-\chordmode {
-  c1:sus2
-}
+@code{c1:sus2}
+@tab
+@lilypond[line-width=2.1\cm,noragged-right,notime]
+<<
+  \chords { c1:sus2 }
+  \chordmode { c1:sus2 }
+>>
 @end lilypond
 
 @item
 Suspended fourth
 @tab
-Perfect fourth, perfect fifth
+Perfect fourth, @*perfect fifth
 @tab
 @code{sus4}
 @tab
-@lilypond[line-width=2.8\cm,noragged-right, notime]
-\chordmode {
-  c1:sus4
-}
+@code{c1:sus4}
+@tab
+@lilypond[line-width=2.1\cm,noragged-right,notime]
+<<
+  \chords { c1:sus4 }
+  \chordmode { c1:sus4 }
+>>
 @end lilypond
 
 @item
-Power chord (two-voiced)
+Power chord @*(two-voiced)
 @tab
 Perfect fifth
 @tab
 @code{1.5}
 @tab
-@lilypond[line-width=2.8\cm,noragged-right, notime]
-\chordmode {
-  \powerChords
-  c1:1.5
-}
+@code{\powerChords c1:1.5}
+@tab
+@lilypond[line-width=2.1\cm,noragged-right,notime]
+\chordmode { \powerChords c1:1.5 }
 @end lilypond
 
 @item
-Power chord (three-voiced)
+Power chord @*@w{(three-voiced)}
 @tab
-Perfect fifth, octave
+Perfect fifth, @*octave
 @tab
 @code{1.5.8}
 @tab
-@lilypond[line-width=2.8\cm,noragged-right, notime]
-\chordmode {
-  \powerChords
-  c1:1.5.8
-}
+@code{\powerChords c1:1.5.8}
+@tab
+@lilypond[line-width=2.1\cm,noragged-right,notime]
+  \chordmode { \powerChords c1:1.5.8 }
 @end lilypond
 
 @end multitable
@@ -1152,6 +1228,7 @@ see @ref{Formatting text}.
 	     \doc-chars #kievan
 @end lilypond
 
+
 @node Note head styles
 @appendixsec Note head styles
 
@@ -1161,6 +1238,241 @@ The following styles may be used for note heads.
 @lilypondfile[noindent]{note-head-style.ly}
 
 
+@node Clef styles
+@appendixsec Clef styles
+
+The following table shows all the different clef styles possible
+(including where @emph{middle C} sits relative to the clef).
+
+@multitable @columnfractions .30 .2 .30 .2
+
+@headitem
+Example
+@tab
+Output
+@tab
+Example
+@tab
+Output
+
+
+@item
+@code{\clef G}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+\clef G c1
+@end lilypond
+
+@tab
+@code{\clef "G2"}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+\clef "G2"
+c1
+@end lilypond
+
+@item
+@code{\clef treble}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+\clef treble
+c1
+@end lilypond
+
+@tab
+@code{\clef violin}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+\clef violin
+c1
+@end lilypond
+
+@item
+@code{\clef french}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+\clef french
+c1
+@end lilypond
+
+@tab
+@code{\clef GG}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+\clef GG
+c1
+@end lilypond
+
+@item
+@code{\clef tenorG}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+\clef tenorG
+c1
+@end lilypond
+
+@tab
+@code{\clef soprano}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+\clef soprano
+c1
+@end lilypond
+
+@item
+@code{\clef mezzosoprano}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+\clef mezzosoprano
+c1
+@end lilypond
+
+@tab
+@code{\clef C}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+\clef C
+c1
+@end lilypond
+
+@item
+@code{\clef alto}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+\clef alto
+c1
+@end lilypond
+
+@tab
+@code{\clef tenor}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+\clef tenor
+c1
+@end lilypond
+
+@item
+@code{\clef baritone}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+\clef baritone
+c1
+@end lilypond
+
+@tab
+@code{\clef varC}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+\clef varC
+c1
+@end lilypond
+
+@item
+@code{\clef altovarC}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+\clef altovarC
+c1
+@end lilypond
+
+@tab
+@code{\clef tenorvarC}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+\clef tenorvarC
+c1
+@end lilypond
+
+@item
+@code{\clef baritonevarC}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+\clef baritonevarC
+c1
+@end lilypond
+
+@tab
+@code{\clef varbaritone}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+\clef varbaritone
+c1
+@end lilypond
+
+@item
+@code{\clef baritonevarF}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+\clef baritonevarF
+c1
+@end lilypond
+
+@tab
+@code{\clef F}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+\clef F
+c1
+@end lilypond
+
+@item
+@code{\clef bass}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+\clef bass
+c1
+@end lilypond
+
+@tab
+@code{\clef subbass}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+\clef subbass
+c1
+@end lilypond
+
+@item
+@code{\clef percussion}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+\clef percussion
+c1
+@end lilypond
+
+@tab
+@c @example does not work as expected within multitables
+@code{
+\new TabStaff @{ @*
+@ @ \clef tab @*
+@}
+}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+\new TabStaff {
+  \clef tab
+  c1
+}
+@end lilypond
+
+@item
+@c @example does not work as expected within multitables
+@code{
+\new TabStaff @{ @*
+@ @ \clef moderntab @*
+@}
+}
+@tab
+@lilypond[line-width=3\cm,notime,ragged-right,relative=1]
+\new TabStaff {
+  \clef moderntab
+  c1
+}
+@end lilypond
+
+
+@end multitable
+
+
 @node Text markup commands
 @appendixsec Text markup commands