Merge branch 'master' of ssh+git://git.sv.gnu.org/srv/git/lilypond

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

diff --git a/Documentation/user/notation-appendices.itely b/Documentation/user/notation-appendices.itely
index 230fa62d46481ba7654412069fc0b25f687fb171..a7c08b65ab16e1357d7587e184910c66675e9043 100644 (file)
--- a/Documentation/user/notation-appendices.itely
+++ b/Documentation/user/notation-appendices.itely
@@ -1,14 +1,28 @@
-@c -*- coding: latin-1; mode: texinfo; -*-
+@c -*- coding: utf-8; mode: texinfo; -*-
 @c This file is part of lilypond.tely
+@ignore
+    Translation of GIT committish: FILL-IN-HEAD-COMMITTISH
+
+    When revising a translation, copy the HEAD committish of the
+    version that you are working on.  See TRANSLATION for details.
+@end ignore
 
-@node Notation manual details
-@appendix Notation manual details
+@node Notation manual tables
+@appendix Notation manual tables
 
 @menu
 * Chord name chart::            
 * MIDI instruments::            
 * List of colors::              
 * The Feta font::               
+* Note head styles::            
+* Overview of text markup commands::  
+* Overview of text markup list commands::  
+* List of articulations::       
+* All context properties::      
+* Layout properties::           
+* Identifiers::                 
+* Scheme functions::            
 @end menu
 
 
@@ -27,7 +41,7 @@ names, along with the pitches they represent.
 The following is a list of names that can be used for the
 @code{midiInstrument} property.
 
-@example 
+@example
 acoustic grand            contrabass           lead 7 (fifths)
 bright acoustic           tremolo strings      lead 8 (bass+lead)
 electric grand            pizzicato strings    pad 1 (new age)
@@ -70,8 +84,8 @@ synth bass 1              lead 2 (sawtooth)    telephone ring
 synth bass 2              lead 3 (calliope)    helicopter
 violin                    lead 4 (chiff)       applause
 viola                     lead 5 (charang)     gunshot
-cello                     lead 6 (voice) 
-@end example 
+cello                     lead 6 (voice)
+@end example
 
 
 @node List of colors
@@ -79,6 +93,11 @@ cello                     lead 6 (voice)
 
 @subsubheading Normal colors
 
+Usage syntax is detailed in @ref{Coloring objects}.
+
+@cindex List of colors
+@cindex Colors, list of
+
 @verbatim
 black       white          red         green
 blue        cyan           magenta     yellow
@@ -91,13 +110,13 @@ darkcyan    darkmagenta    darkyellow
 
 X color names come several variants:
 
-Any name that is spelled as a single word with capitalisation
-(e.g. ``LightSlateBlue'') can also be spelled as space separated
-words without capitalisation (e.g. ``light slate blue'').
+Any name that is spelled as a single word with capitalization
+(e.g. @q{LightSlateBlue}) can also be spelled as space separated
+words without capitalization (e.g. @q{light slate blue}).
 
-The word ``grey'' can always be spelled ``gray'' (e.g. ``DarkSlateGray''). 
+The word @q{grey} can always be spelled @q{gray} (e.g. @q{DarkSlateGray}).
 
-Some names can take a numerical suffix (e.g. ``LightSalmon4'').
+Some names can take a numerical suffix (e.g. @q{LightSalmon4}).
 
 
 @subsubheading Color Names without a numerical suffix:
@@ -173,27 +192,98 @@ Where N is in the range 0-100.
 @node The Feta font
 @appendixsec The Feta font
 
-The following symbols are available in the Feta font and may be
+@cindex Feta font
+@cindex Font, Feta
+
+The following symbols are available in the Emmentaler font and may be
 accessed directly using text markup such as @code{g^\markup @{
 \musicglyph #"scripts.segno" @}}, see @ref{Text markup}.
 
+@lilypondfile[noindent]{font-table.ly}
 
-@lilypondfile[noindent]{feta16list.ly}
 
+@node Note head styles
+@appendixsec Note head styles
+
+@cindex note head styles
+The following styles may be used for note heads.
+
+@lilypondfile[noindent]{note-head-style.ly}
+
+
+@node Overview of text markup commands
+@appendixsec Overview of text markup commands
+
+The following commands can all be used inside @code{\markup @{ @}}.
+
+@include markup-commands.tely
+
+@node Overview of text markup list commands
+@appendixsec Overview of text markup list commands
+
+The following commands can all be used with @code{\markuplines}.
+
+@include markup-list-commands.tely
+
+@node List of articulations
+@appendixsec 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}
 
-@lilypondfile[noindent]{parmesan16list.ly}
 
 
-@ignore
 @node All context properties
-@a ppendixsec All context properties
+@appendixsec All context properties
 
-@i nclude context-properties.tely
+@include context-properties.tely
 
 
 @node Layout properties
-@ap pendixsec Layout properties
+@appendixsec Layout properties
 
-@in clude layout-properties.tely
+@include layout-properties.tely
+
+
+@node Identifiers
+@appendixsec Identifiers
+
+@include identifiers.tely
+
+
+@node Scheme functions
+@appendixsec Scheme functions
+
+@include scheme-functions.tely
 
-@end ignore