Merge branch 'master' of ssh+git://hanwen@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 59f53d449bed56b80976ecd3102e3cdf10b6efd3..77c3d366797840036275f67f829942e51a8e78e2 100644 (file)
--- a/Documentation/user/notation-appendices.itely
+++ b/Documentation/user/notation-appendices.itely
@@ -1,14 +1,21 @@
 @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::            
 @end menu
 
 
@@ -27,7 +34,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 +77,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 +86,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
@@ -92,12 +104,12 @@ 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'').
+(e.g. @q{LightSlateBlue}) can also be spelled as space separated
+words without capitalisation (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,25 +185,32 @@ 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
 
-@lilypondfile[noindent]{parmesan16list.ly}
+@cindex note head styles
+The following styles may be used for note heads.
 
+@lilypondfile[noindent]{note-head-style.ly}
 
 @ignore
-@node All context properties
+@n ode All context properties
 @a ppendixsec All context properties
 
 @i nclude context-properties.tely
 
 
-@node Layout properties
+@n ode Layout properties
 @ap pendixsec Layout properties
 
 @in clude layout-properties.tely