Doc: Appendix - Articulations and Ornamentation - part 1

[lilypond.git] / Documentation / notation / notation-appendices.itely

diff --git a/Documentation/notation/notation-appendices.itely b/Documentation/notation/notation-appendices.itely
index bf8ac4efd7500c1f306a743859f21fa76ee86b9b..d4e6806d884eda779c10f30dbecf17ea0ad04f79 100644 (file)
--- a/Documentation/notation/notation-appendices.itely
+++ b/Documentation/notation/notation-appendices.itely
@@ -1246,241 +1246,226 @@ The following table shows all the different clef styles possible
 
 @multitable @columnfractions .30 .2 .30 .2
 
-@item
-@b{Example}
+@headitem
+Example
 @tab
-@b{Output}
+Output
 @tab
-@b{Example}
+Example
 @tab
-@b{Output}
+Output
 
 
 @item
 @code{\clef G}
 @tab
 @lilypond[line-width=3\cm,notime,ragged-right,relative=1]
-{
-  \clef G
-  { c1 }
-}
+\clef G c1
 @end lilypond
+
 @tab
-@code{\clef treble}
+@code{\clef "G2"}
 @tab
 @lilypond[line-width=3\cm,notime,ragged-right,relative=1]
-{
-  \clef treble
-  { c1 }
-}
+\clef "G2"
+c1
 @end lilypond
 
 @item
-@code{\clef violin}
+@code{\clef treble}
 @tab
 @lilypond[line-width=3\cm,notime,ragged-right,relative=1]
-{
-  \clef violin
-  { c1 }
-}
+\clef treble
+c1
 @end lilypond
+
 @tab
-@code{\clef french}
+@code{\clef violin}
 @tab
 @lilypond[line-width=3\cm,notime,ragged-right,relative=1]
-{
-  \clef french
-  { c1 }
-}
+\clef violin
+c1
 @end lilypond
 
 @item
-@code{\clef GG}
+@code{\clef french}
 @tab
 @lilypond[line-width=3\cm,notime,ragged-right,relative=1]
-{
-  \clef GG
-  { c1 }
-}
+\clef french
+c1
 @end lilypond
 
 @tab
-@code{\clef tenorG}
+@code{\clef GG}
 @tab
 @lilypond[line-width=3\cm,notime,ragged-right,relative=1]
-{
-  \clef tenorG
-  { c1 }
-}
+\clef GG
+c1
 @end lilypond
 
 @item
-@code{\clef soprano}
+@code{\clef tenorG}
 @tab
 @lilypond[line-width=3\cm,notime,ragged-right,relative=1]
-{
-  \clef soprano
-  { c1 }
-}
+\clef tenorG
+c1
 @end lilypond
 
 @tab
-@code{\clef mezzosoprano}
+@code{\clef soprano}
 @tab
 @lilypond[line-width=3\cm,notime,ragged-right,relative=1]
-{
-  \clef mezzosoprano
-  { c1 }
-}
+\clef soprano
+c1
 @end lilypond
 
 @item
-@code{\clef C}
+@code{\clef mezzosoprano}
 @tab
 @lilypond[line-width=3\cm,notime,ragged-right,relative=1]
-{
-  \clef C
-  { c1 }
-}
+\clef mezzosoprano
+c1
 @end lilypond
 
 @tab
-@code{\clef alto}
+@code{\clef C}
 @tab
 @lilypond[line-width=3\cm,notime,ragged-right,relative=1]
-{
-  \clef alto
-  { c1 }
-}
+\clef C
+c1
 @end lilypond
 
 @item
-@code{\clef tenor}
+@code{\clef alto}
 @tab
 @lilypond[line-width=3\cm,notime,ragged-right,relative=1]
-{
-  \clef tenor
-  { c1 }
-}
+\clef alto
+c1
 @end lilypond
 
 @tab
-@code{\clef baritone}
+@code{\clef tenor}
 @tab
 @lilypond[line-width=3\cm,notime,ragged-right,relative=1]
-{
-  \clef baritone
-  { c1 }
-}
+\clef tenor
+c1
 @end lilypond
 
 @item
-@code{\clef varC}
+@code{\clef baritone}
 @tab
 @lilypond[line-width=3\cm,notime,ragged-right,relative=1]
-{
-  \clef varC
-  { c1 }
-}
+\clef baritone
+c1
 @end lilypond
 
 @tab
-@code{\clef altovarC}
+@code{\clef varC}
 @tab
 @lilypond[line-width=3\cm,notime,ragged-right,relative=1]
-{
-  \clef altovarC
-  { c1 }
-}
+\clef varC
+c1
 @end lilypond
 
 @item
-@code{\clef tenorvarC}
+@code{\clef altovarC}
 @tab
 @lilypond[line-width=3\cm,notime,ragged-right,relative=1]
-{
-  \clef tenorvarC
-  { c1 }
-}
+\clef altovarC
+c1
 @end lilypond
 
 @tab
-@code{\clef baritonevarC}
+@code{\clef tenorvarC}
 @tab
 @lilypond[line-width=3\cm,notime,ragged-right,relative=1]
-{
-  \clef baritonevarC
-  { c1 }
-}
+\clef tenorvarC
+c1
 @end lilypond
 
 @item
-@code{\clef varbaritone}
+@code{\clef baritonevarC}
 @tab
 @lilypond[line-width=3\cm,notime,ragged-right,relative=1]
-{
-  \clef varbaritone
-  { c1 }
-}
+\clef baritonevarC
+c1
 @end lilypond
 
 @tab
-@code{\clef baritonevarF}
+@code{\clef varbaritone}
 @tab
 @lilypond[line-width=3\cm,notime,ragged-right,relative=1]
-{
-  \clef baritonevarF
-  { c1 }
-}
+\clef varbaritone
+c1
 @end lilypond
 
 @item
-@code{\clef F}
+@code{\clef baritonevarF}
 @tab
 @lilypond[line-width=3\cm,notime,ragged-right,relative=1]
-{
-  \clef F
-  { c1 }
-}
+\clef baritonevarF
+c1
 @end lilypond
 
 @tab
-@code{\clef bass}
+@code{\clef F}
 @tab
 @lilypond[line-width=3\cm,notime,ragged-right,relative=1]
-{
-  \clef bass
-  { c1 }
-}
+\clef F
+c1
 @end lilypond
 
 @item
-@code{\clef subbass}
+@code{\clef bass}
 @tab
 @lilypond[line-width=3\cm,notime,ragged-right,relative=1]
-{
-  \clef subbass
-  { c1 }
-}
+\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 }
+\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
-@code{\clef tab}
+@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]
-{
-  \clef tab
-  { c1 }
+\new TabStaff {
+  \clef moderntab
+  c1
 }
 @end lilypond
 
@@ -1571,7 +1556,7 @@ for more readability.
 @cindex verylongfermata
 
 The following scripts are available in the Feta font and may be
-attached to notes (eg. @samp{c\accent}).
+attached to notes (eg. @samp{f\accent}).
 
 @c Articulations and ornamentations
 @c Fingering instructions (for "thumb")
@@ -1596,18 +1581,172 @@ attached to notes (eg. @samp{c\accent}).
 @node Articulation scripts
 @unnumberedsubsec Articulation scripts
 
-@lilypond[quote]
-\include "script-chart.ly"
-\new RhythmicStaff { \scriptStaff #articulations }
+@multitable @columnfractions .25 .25 .25 .25
+
+@headitem
+Example
+@tab
+Output
+@tab
+Example
+@tab
+Output
+
+@item
+@code{\accent}
+@tab
+@lilypond[notime,ragged-right,relative=2]
+f\accent e,_\accent
+@end lilypond
+@tab
+@code{\espressivo}
+@tab
+@lilypond[notime,ragged-right,relative=2]
+f\espressivo e,_\espressivo
+@end lilypond
+
+@item
+@code{\marcato}
+@tab
+@lilypond[notime,ragged-right,relative=2]
+f\marcato e,_\marcato
+@end lilypond
+@tab
+@code{\portato}
+@tab
+@lilypond[notime,ragged-right,relative=2]
+f\portato e,_\portato
+@end lilypond
+
+@item
+@code{\staccatissimo}
+@tab
+@lilypond[notime,ragged-right,relative=2]
+f\staccatissimo e,_\staccatissimo
+@end lilypond
+@tab
+@code{\staccato}
+@tab
+@lilypond[notime,ragged-right,relative=2]
+f\staccato e,_\staccato
 @end lilypond
 
+@item
+@code{\tenuto}
+@tab
+@lilypond[notime,ragged-right,relative=2]
+f\tenuto e,_\tenuto
+@end lilypond
+
+@end multitable
+
+
 @node Ornament scripts
 @unnumberedsubsec Ornament scripts
 
-@lilypond[quote]
-\include "script-chart.ly"
-\new RhythmicStaff { \scriptStaff #ornaments }
+@multitable @columnfractions .25 .25 .25 .25
+
+@headitem
+Example
+@tab
+Output
+@tab
+Example
+@tab
+Output
+
+@item
+@code{\prall}
+@tab
+@lilypond[notime,ragged-right,relative=2]
+f\prall e,_\prall
 @end lilypond
+@tab
+@code{\mordent}
+@tab
+@lilypond[notime,ragged-right,relative=2]
+f\mordent e,_\mordent
+@end lilypond
+
+@item
+@code{\prallmordent}
+@tab
+@lilypond[notime,ragged-right,relative=2]
+f\prallmordent e,_\prallmordent
+@end lilypond
+@tab
+@code{\turn}
+@tab
+@lilypond[notime,ragged-right,relative=2]
+f\turn e,_\turn
+@end lilypond
+
+@item
+@code{\upprall}
+@tab
+@lilypond[notime,ragged-right,relative=2]
+f\upprall e,_\upprall
+@end lilypond
+@tab
+@code{\downprall}
+@tab
+@lilypond[notime,ragged-right,relative=2]
+f\downprall e,_\downprall
+@end lilypond
+
+@item
+@code{\upmordent}
+@tab
+@lilypond[notime,ragged-right,relative=2]
+f\upmordent e,_\upmordent
+@end lilypond
+@tab
+@code{\downmordent}
+@tab
+@lilypond[notime,ragged-right,relative=2]
+f\downmordent e,_\downmordent
+@end lilypond
+
+@item
+@code{\lineprall}
+@tab
+@lilypond[notime,ragged-right,relative=2]
+f\lineprall e,_\lineprall
+@end lilypond
+@tab
+@code{\prallprall}
+@tab
+@lilypond[notime,ragged-right,relative=2]
+f\prallprall e,_\prallprall
+@end lilypond
+
+@item
+@code{\pralldown}
+@tab
+@lilypond[notime,ragged-right,relative=2]
+f\pralldown e,_\pralldown
+@end lilypond
+@tab
+@code{\prallup}
+@tab
+@lilypond[notime,ragged-right,relative=2]
+f\prallup e,_\prallup
+@end lilypond
+
+@item
+@code{\reverseturn}
+@tab
+@lilypond[notime,ragged-right,relative=2]
+f\reverseturn e,_\reverseturn
+@end lilypond
+@tab
+@code{\trill}
+@tab
+@lilypond[notime,ragged-right,relative=2]
+f\trill e,_\trill
+@end lilypond
+
+@end multitable
 
 @node Fermata scripts
 @unnumberedsubsec Fermata scripts