Merge branch 'master' into dev/texi2html

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

diff --git a/Documentation/user/notation-appendices.itely b/Documentation/user/notation-appendices.itely
index 18fe55756b141505a9d17206cab2a1cecc73d533..20ad0c198d5eadca60243df6e51ea6670712aabf 100644 (file)
--- a/Documentation/user/notation-appendices.itely
+++ b/Documentation/user/notation-appendices.itely
@@ -7,6 +7,8 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
+@c \version "2.11.51"
+
 @node Notation manual tables
 @appendix Notation manual tables
 
@@ -16,9 +18,13 @@
 * List of colors::              
 * The Feta font::               
 * Note head styles::            
-* Overview of text markup commands::  
-* Overview of text markup list commands::  
+* Text markup commands::        
+* Text markup list commands::   
 * List of articulations::       
+* All context properties::      
+* Layout properties::           
+* Identifiers::                 
+* Scheme functions::            
 @end menu
 
 
@@ -106,9 +112,9 @@ darkcyan    darkmagenta    darkyellow
 
 X color names come several variants:
 
-Any name that is spelled as a single word with capitalisation
+Any name that is spelled as a single word with capitalization
 (e.g. @q{LightSlateBlue}) can also be spelled as space separated
-words without capitalisation (e.g. @q{light slate blue}).
+words without capitalization (e.g. @q{light slate blue}).
 
 The word @q{grey} can always be spelled @q{gray} (e.g. @q{DarkSlateGray}).
 
@@ -193,7 +199,7 @@ Where N is in the range 0-100.
 
 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}.
+\musicglyph #"scripts.segno" @}}, see @ref{Formatting text}.
 
 @lilypondfile[noindent]{font-table.ly}
 
@@ -206,23 +212,12 @@ 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
-@section List of articulations
+@appendixsec List of articulations
 
 @cindex accent
 @cindex marcato
@@ -260,16 +255,26 @@ Here is a chart showing all scripts available,
 
 
 
-@ignore
-@n ode All context properties
-@a ppendixsec All context properties
+@node All context properties
+@appendixsec All context properties
 
-@i nclude context-properties.tely
+@include context-properties.tely
 
 
-@n ode Layout properties
-@ap pendixsec Layout properties
+@node 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