X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fnotation%2Fnotation-appendices.itely;h=91d7d81998c5d91e752f46265130cbbb07fc768c;hb=4d6f2a27cc17261bc0970327de8665a6b771734b;hp=75c12d4e4d28f3ac06784ea8e5287b7322a8cea7;hpb=a81765842577dd2418fa41514f682d468a5ad483;p=lilypond.git

diff --git a/Documentation/notation/notation-appendices.itely b/Documentation/notation/notation-appendices.itely
index 75c12d4e4d..91d7d81998 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
@@ -431,15 +507,24 @@ The chart below shows the predefined string tunings.
 @node Predefined fretboard diagrams
 @appendixsec Predefined fretboard diagrams
 
-The chart below shows the predefined fretboard diagrams for guitar.
+@menu
+* Diagrams for Guitar::
+* Diagrams for Ukulele::
+* Diagrams for Mandolin::
+@end menu
+
+@node Diagrams for Guitar
+@unnumberedsubsec Diagrams for Guitar
 
 @lilypondfile[line-width=15.5\cm]{display-predefined-fretboards.ly}
 
-The chart below shows the predefined fretboard diagrams for ukulele.
+@node Diagrams for Ukulele
+@unnumberedsubsec Diagrams for Ukulele
 
 @lilypondfile[line-width=15.5\cm]{display-predefined-ukulele-fretboards.ly}
 
-The chart below shows the predefined fretboard diagrams for mandolin.
+@node Diagrams for Mandolin
+@unnumberedsubsec Diagrams for Mandolin
 
 @lilypondfile[line-width=15.5\cm]{display-predefined-mandolin-fretboards.ly}
 
@@ -1143,6 +1228,7 @@ see @ref{Formatting text}.
 	     \doc-chars #kievan
 @end lilypond
 
+
 @node Note head styles
 @appendixsec Note head styles
 
@@ -1152,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
 
@@ -1188,54 +1509,10 @@ for more readability.
 @appendixsec List of articulations
 
 
-@cindex accent
-@cindex accentus
-@cindex circulus
-@cindex coda
-@cindex downbow
-@cindex downmordent
-@cindex downprall
-@cindex espressivo
-@cindex fermata
-@cindex flageolet
-@cindex halfopen
-@cindex ictus
-@cindex lheel
-@cindex lineprall
-@cindex longfermata
-@cindex ltoe
-@cindex marcato
-@cindex mordent
-@cindex open
-@cindex portato
-@cindex prall
-@cindex pralldown
-@cindex prallmordent
-@cindex prallprall
-@cindex prallup
-@cindex reverseturn
-@cindex rheel
-@cindex rtoe
-@cindex segno
-@cindex semicirculus
-@cindex shortfermata
-@cindex signumcongruentiae
-@cindex snappizzicato
-@cindex staccatissimo
-@cindex staccato
-@cindex stopped
-@cindex tenuto
-@cindex thumb
-@cindex trill
-@cindex turn
-@cindex upbow
-@cindex upmordent
-@cindex upprall
-@cindex varcoda
-@cindex verylongfermata
-
-The following scripts are available in the Feta font and may be
-attached to notes (eg. @samp{c\accent}).
+The following lists show all the scripts in the Feta font that may be
+attached to notes (eg. @samp{f\accent} or @samp{f->}).  Each example
+shows the script in the @emph{up}, @emph{down} and @emph{neutral}
+positions respectively.
 
 @c Articulations and ornamentations
 @c Fingering instructions (for "thumb")
@@ -1256,56 +1533,351 @@ attached to notes (eg. @samp{c\accent}).
 * Ancient scripts::
 @end menu
 
+@ignore
+The @multitable @columnfraction value discrepancy between the first and
+the remaining columns is deliberate; it seems (at least visually
+anyway) the gap (after building the documentation) between first and
+second column examples was always larger than between the remaining
+columns - JL
+@end ignore
+
+@cindex accent
+@cindex espressivo
+@cindex marcato
+@cindex portato
+@cindex staccatissimo
+@cindex staccato
+@cindex tenuto
+@cindex thumb
 
 @node Articulation scripts
 @unnumberedsubsec Articulation scripts
 
-@lilypond[quote]
-\include "script-chart.ly"
-\new RhythmicStaff { \scriptStaff #articulations }
+@multitable @columnfractions .22 .25 .25 .25
+
+@item
+@code{\accent} or @code{->}
+@lilypond[notime,relative=2]
+f^\accent e,_\accent b'\accent
+@end lilypond
+@tab
+@code{\espressivo}
+@lilypond[notime,relative=2]
+f^\espressivo e,_\espressivo b'\espressivo
+@end lilypond
+@tab
+@code{\marcato} or @code{-^}
+@lilypond[notime,relative=2]
+f^\marcato e,_\marcato b'\marcato
+@end lilypond
+@tab
+@code{\portato} or @code{-_}
+@lilypond[notime,relative=2]
+f^\portato e,_\portato b'\portato
 @end lilypond
 
+@item
+@code{\staccatissimo} @* or @code{-!}
+@lilypond[notime,relative=2]
+f^\staccatissimo e,_\staccatissimo b'\staccatissimo
+@end lilypond
+@tab
+@code{\staccato} or @code{-.}
+@lilypond[notime,relative=2]
+f^\staccato e,_\staccato b'\staccato
+@end lilypond
+@tab
+@code{\tenuto} or @code{--}
+@lilypond[notime,relative=2]
+f^\tenuto e,_\tenuto b'\tenuto
+@end lilypond
+
+@end multitable
+
+@cindex prall
+@cindex prallup
+@cindex pralldown
+@cindex upprall
+@cindex downprall
+@cindex prallprall
+@cindex lineprall
+@cindex prallmordent
+@cindex mordent
+@cindex upmordent
+@cindex downmordent
+@cindex trill
+@cindex turn
+@cindex reverseturn
+
 @node Ornament scripts
 @unnumberedsubsec Ornament scripts
 
-@lilypond[quote]
-\include "script-chart.ly"
-\new RhythmicStaff { \scriptStaff #ornaments }
+@multitable @columnfractions .22 .25 .25 .25
+
+@item
+@code{\prall}
+@lilypond[notime,relative=2]
+f^\prall e,_\prall b'\prall
+@end lilypond
+@tab
+@code{\prallup}
+@lilypond[notime,relative=2]
+f^\prallup e,_\prallup b'\prallup
+@end lilypond
+@tab
+@code{\pralldown}
+@lilypond[notime,relative=2]
+f^\pralldown e,_\pralldown b'\pralldown
+@end lilypond
+@tab
+@code{\upprall}
+@lilypond[notime,relative=2]
+f^\upprall e,_\upprall b'\upprall
+@end lilypond
+
+@item
+@code{\downprall}
+@lilypond[notime,relative=2]
+f^\downprall e,_\downprall b'\downprall
+@end lilypond
+@tab
+@code{\prallprall}
+@lilypond[notime,relative=2]
+f^\prallprall e,_\prallprall b'\prallprall
+@end lilypond
+@tab
+@code{\lineprall}
+@lilypond[notime,relative=2]
+f^\lineprall e,_\lineprall b'\lineprall
+@end lilypond
+@tab
+@code{\prallmordent}
+@lilypond[notime,relative=2]
+f^\prallmordent e,_\prallmordent b'\prallmordent
 @end lilypond
 
+@item
+@code{\mordent}
+@lilypond[notime,relative=2]
+f^\mordent e,_\mordent b'\mordent
+@end lilypond
+@tab
+@code{\upmordent}
+@lilypond[notime,relative=2]
+f^\upmordent e,_\upmordent b'\upmordent
+@end lilypond
+@tab
+@code{\downmordent}
+@lilypond[notime,relative=2]
+f^\downmordent e,_\downmordent b'\downmordent
+@end lilypond
+@tab
+@code{\trill}
+@lilypond[notime,relative=2]
+f^\trill e,_\trill b'\trill
+@end lilypond
+
+@item
+@code{\turn}
+@lilypond[notime,relative=2]
+f^\turn e,_\turn b'\reverseturn
+@end lilypond
+@tab
+@code{\reverseturn}
+@lilypond[notime,relative=2]
+f^\reverseturn e,_\reverseturn b'\reverseturn
+@end lilypond
+
+@end multitable
+
+@cindex fermata
+@cindex shortfermata
+@cindex longfermata
+@cindex verylongfermata
+
 @node Fermata scripts
 @unnumberedsubsec Fermata scripts
 
-@lilypond[quote]
-\include "script-chart.ly"
-\new RhythmicStaff { \scriptStaff #fermatas }
+@multitable @columnfractions .22 .25 .25 .25
+
+@item
+@code{\shortfermata}
+@lilypond[notime,relative=2]
+f^\shortfermata e,_\shortfermata b'\shortfermata
 @end lilypond
+@tab
+@code{\fermata}
+@lilypond[notime,relative=2]
+f^\fermata e,_\fermata b'\fermata
+@end lilypond
+@tab
+@code{\longfermata}
+@lilypond[notime,relative=2]
+f^\longfermata e,_\longfermata b'\longfermata
+@end lilypond
+@tab
+@code{\verylongfermata}
+@lilypond[notime,relative=2]
+f^\verylongfermata e,_\verylongfermata b'\verylongfermata
+@end lilypond
+
+@end multitable
+
+@cindex upbow
+@cindex downbow
+@cindex flageolet
+@cindex open
+@cindex halfopen
+@cindex lheel
+@cindex rheel
+@cindex ltoe
+@cindex rtoe
+@cindex snappizzicato
+@cindex stopped
 
 @node Instrument-specific scripts
 @unnumberedsubsec Instrument-specific scripts
 
-@lilypond[quote]
-\include "script-chart.ly"
-\new RhythmicStaff { \scriptStaff #instrument-specific }
+@multitable @columnfractions .22 .25 .25 .25
+
+@item
+@code{\upbow}
+@lilypond[notime,relative=2]
+f^\upbow e,_\upbow b'\upbow
+@end lilypond
+@tab
+@code{\downbow}
+@lilypond[notime,relative=2]
+f^\downbow e,_\downbow b'\downbow
+@end lilypond
+@tab
+@code{\flageolet}
+@lilypond[notime,relative=2]
+f^\flageolet e,_\flageolet b'\flageolet
+@end lilypond
+@tab
+@code{\open}
+@lilypond[notime,relative=2]
+f^\open e,_\open b'\open
+@end lilypond
+
+@item
+@code{\halfopen}
+@lilypond[notime,relative=2]
+f^\halfopen e,_\halfopen b'\halfopen
+@end lilypond
+@tab
+@code{\lheel}
+@lilypond[notime,relative=2]
+f^\lheel e,_\lheel b'\lheel
+@end lilypond
+@tab
+@code{\rheel}
+@lilypond[notime,relative=2]
+f^\rheel e,_\rheel b'\rheel
+@end lilypond
+@tab
+@code{\ltoe}
+@lilypond[notime,relative=2]
+f^\ltoe e,_\ltoe b'\ltoe
 @end lilypond
 
+@item
+@code{\rtoe}
+@lilypond[notime,relative=2]
+f^\rtoe e,_\rtoe b'\rtoe
+@end lilypond
+@tab
+@code{\snappizzicato}
+@lilypond[notime,relative=2]
+f^\snappizzicato e,_\snappizzicato b'\snappizzicato
+@end lilypond
+@tab
+@code{\stopped} or @code{-+}
+@lilypond[notime,relative=2]
+f^\stopped e,_\stopped b'\stopped
+@end lilypond
+
+@end multitable
+
+@cindex segno
+@cindex coda
+@cindex varcoda
+
 @node Repeat sign scripts
 @unnumberedsubsec Repeat sign scripts
 
-@lilypond[quote]
-\include "script-chart.ly"
-\new RhythmicStaff { \scriptStaff #repeats }
+@multitable @columnfractions .22 .25 .25 .25
+
+@item
+@code{\segno}
+@lilypond[notime,relative=2]
+f^\segno e,_\segno b'\segno
+@end lilypond
+@tab
+@code{\coda}
+@lilypond[notime,relative=2]
+f^\coda e,_\coda b'\coda
 @end lilypond
+@tab
+@code{\varcoda}
+@lilypond[notime,relative=2]
+f^\varcoda e,_\varcoda b'\varcoda
+@end lilypond
+
+@end multitable
+
+@cindex accentus
+@cindex circulus
+@cindex ictus
+@cindex semicirculus
+@cindex signumcongruentiae
 
 @node Ancient scripts
 @unnumberedsubsec Ancient scripts
 
-@lilypond[quote]
-\include "script-chart.ly"
+@multitable @columnfractions .22 .25 .25 .25
+
+@item
+@code{\accentus}
+@lilypond[notime]
+\include "gregorian.ly"
+\new VaticanaStaff { e'^\accentus s4 f_\accentus s4 b\accentus}
+@end lilypond
+@tab
+@code{\circulus}
+@lilypond[notime]
+\include "gregorian.ly"
+\new VaticanaStaff { e'^\circulus s4 f_\circulus s4 b\circulus  }
+@end lilypond
+@tab
+@code{\ictus}
+@lilypond[notime]
+\include "gregorian.ly"
+\new VaticanaStaff { e'^\ictus s4 f_\ictus s4 b\ictus}
+@end lilypond
+
+@item
+@code{\semicirculus}
+@lilypond[notime]
+\include "gregorian.ly"
+\new VaticanaStaff {
+  e'^\semicirculus s4 f_\semicirculus s4 b\semicirculus
+}
+@end lilypond
+@tab
+@code{\signumcongruentiae}
+@lilypond[notime]
 \include "gregorian.ly"
-\new VaticanaStaff { \scriptStaffAncient #ancient }
+\new VaticanaStaff {
+  e'^\signumcongruentiae s4
+  f_\signumcongruentiae s4
+  b\signumcongruentiae
+}
 @end lilypond
 
+@end multitable
+
 
 @node Percussion notes
 @appendixsec Percussion notes