Move articulations into an appendix, and move separate file into the manual.

diff --git a/Documentation/user/expressive.itely b/Documentation/user/expressive.itely
index fe4a80c2e1dd50c58759a5e112597a979f8401b5..ea9ea09cbda68178edd7078e3fd7803f5b246734 100644 (file)
--- a/Documentation/user/expressive.itely
+++ b/Documentation/user/expressive.itely
@@ -35,9 +35,22 @@
 A variety of symbols can appear above and below notes to indicate
 different characteristics of the performance.  They are added to a
 note by adding a dash and the character signifying the
-articulation.  They are demonstrated here
+articulation.
 
-@lilypondfile[quote,ragged-right]{script-abbreviations.ly}
+See @ref{List of articulations}.
+
+@c @l ilypondfile[quote,ragged-right]{script-abbreviations.ly}
+@lilypond[quote,ragged-right,verbatim,fragment]
+\override TextScript  #'font-family = #'typewriter
+\override TextScript  #'font-shape = #'upright
+c''4-._"c-."      s4
+c''4--_"c--"      s4
+c''4-+_"c-+"      s4
+c''4-|_"c-|"      s4
+c''4->_"c->"      s4
+c''4-^_"c-^"      s4
+c''4-__"c-_"      s4      
+@end lilypond
 
 The meanings of these shorthands can be changed.  See
 @file{ly/@/script@/-init@/.ly} for examples.
@@ -89,10 +102,6 @@ c\fermata c^\fermata c_\fermata
 @cindex coda
 @cindex varcoda
 
-Here is a chart showing all scripts available,
-
-@lilypondfile[ragged-right,quote]{script-chart.ly}
-
 
 @commonprop
 

diff --git a/Documentation/user/notation-appendices.itely b/Documentation/user/notation-appendices.itely
index dc84a7c654774270ab970a01412d8a44bbabc429..18fe55756b141505a9d17206cab2a1cecc73d533 100644 (file)
--- a/Documentation/user/notation-appendices.itely
+++ b/Documentation/user/notation-appendices.itely
@@ -18,6 +18,7 @@
 * Note head styles::            
 * Overview of text markup commands::  
 * Overview of text markup list commands::  
+* List of articulations::       
 @end menu
 
 
@@ -220,6 +221,45 @@ The following commands can all be used with @code{\markuplines}.
 
 @include markup-list-commands.tely
 
+@node List of articulations
+@section List of articulations
+
+@cindex accent
+@cindex marcato
+@cindex staccatissimo
+@cindex espressivo
+@cindex fermata
+@cindex stopped
+@cindex staccato
+@cindex portato
+@cindex tenuto
+@cindex upbow
+@cindex downbow
+@cindex foot marks
+@cindex organ pedal marks
+@cindex turn
+@cindex open
+@cindex stopped
+@cindex flageolet
+@cindex reverseturn
+@cindex trill
+@cindex prall
+@cindex mordent
+@cindex prallprall
+@cindex prallmordent
+@cindex prall, up
+@cindex prall, down
+@cindex thumb marking
+@cindex segno
+@cindex coda
+@cindex varcoda
+
+Here is a chart showing all scripts available,
+
+@lilypondfile[ragged-right,quote]{script-chart.ly}
+
+
+
 @ignore
 @n ode All context properties
 @a ppendixsec All context properties