Doc: add Font to all font nodes (avoids potential confusion).

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

diff --git a/Documentation/user/notation-appendices.itely b/Documentation/user/notation-appendices.itely
index 0158773c578ae7f6a500a044a5113369f033edd0..3f39f420b25a9558ea9ece6523da3c6fc63a5e59 100644 (file)
--- a/Documentation/user/notation-appendices.itely
+++ b/Documentation/user/notation-appendices.itely
@@ -7,21 +7,41 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.51"
+@c \version "2.12.0"
 
 @node Notation manual tables
 @appendix Notation manual tables
 
+@c Please do not delete the following @ignore block.
+@ignore
+Note for editors and translators: In the following menu, two entries
+are needed to link to a pair of automatically generated sections.
+Please keep them and, if using emacs, do not run
+texinfo-all-menus-update without manually restoring them back. These
+menu entries are:
+
+* Text markup commands::
+* Text markup list commands::
+
+and they should go just after
+* Note head styles::
+
+and just before
+* List of articulations::
+@end ignore
+
 @menu
 * Chord name chart::            
-* Common chord modifiers::
+* Common chord modifiers::      
+* Predefined fretboard diagrams::  
 * MIDI instruments::            
 * List of colors::              
 * The Feta font::               
 * Note head styles::            
-* Text markup commands::        
-* Text markup list commands::   
+* Text markup commands::
+* Text markup list commands::
 * List of articulations::       
+* Percussion notes::            
 * All context properties::      
 * Layout properties::           
 * Identifiers::                 
@@ -63,7 +83,7 @@ Major third, perfect fifth
 @tab
 @code{5} or nothing
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
   c1:5
 }
@@ -76,7 +96,7 @@ Minor third, perfect fifth
 @tab
 @code{m} or @code{m5}
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
   c1:m
 }
@@ -89,7 +109,7 @@ Major third, augmented fifth
 @tab
 @code{aug}
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
   c1:aug
 }
@@ -102,7 +122,7 @@ Minor third, diminished fifth
 @tab
 @code{dim}
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
   c1:dim
 }
@@ -115,7 +135,7 @@ Major triad, minor seventh
 @tab
 @code{7}
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
   c1:7
 }
@@ -128,7 +148,7 @@ Major triad, major seventh
 @tab
 @code{maj7} or @code{maj}
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
   c1:maj7
 }
@@ -141,7 +161,7 @@ Minor triad, minor seventh
 @tab
 @code{m7}
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
   c1:m7
 }
@@ -154,7 +174,7 @@ Diminished triad, diminished seventh
 @tab
 @code{dim7}
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
   c1:dim7
 }
@@ -167,7 +187,7 @@ Augmented triad, minor seventh
 @tab
 @code{aug7}
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
   c1:aug7
 }
@@ -178,11 +198,11 @@ Half-diminished seventh
 @tab
 Diminished triad, minor seventh
 @tab
-@code{dim5m7}
+@code{m7.5-}
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
-  c1:dim5m7
+  c1:m7.5-
 }
 @end lilypond
 
@@ -191,11 +211,11 @@ Minor-major seventh
 @tab
 Minor triad, major seventh
 @tab
-@code{7m5}
+@code{maj7.5-}
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
-  c1:7m5
+  c1:maj7.5-
 }
 @end lilypond
 
@@ -206,7 +226,7 @@ Major triad, sixth
 @tab
 @code{6}
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
   c1:6
 }
@@ -219,7 +239,7 @@ Minor triad, sixth
 @tab
 @code{m6}
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
   c1:m6
 }
@@ -232,7 +252,7 @@ Dominant seventh, major ninth
 @tab
 @code{9}
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
   c1:9
 }
@@ -241,11 +261,11 @@ Dominant seventh, major ninth
 @item
 Major ninth
 @tab
-TODO
+Major seventh, major ninth
 @tab
 @code{maj9}
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
   c1:maj9
 }
@@ -254,11 +274,11 @@ TODO
 @item
 Minor ninth
 @tab
-TODO
+Minor seventh, major ninth
 @tab
 @code{m9}
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
   c1:m9
 }
@@ -271,7 +291,7 @@ Dominant ninth, perfect eleventh
 @tab
 @code{11}
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
   c1:11
 }
@@ -280,11 +300,11 @@ Dominant ninth, perfect eleventh
 @item
 Major eleventh
 @tab
-TODO
+Major ninth, perfect eleventh
 @tab
 @code{maj11}
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
   c1:maj11
 }
@@ -293,16 +313,29 @@ TODO
 @item
 Minor eleventh
 @tab
-TODO
+Minor ninth, perfect eleventh
 @tab
 @code{m11}
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
   c1:m11
 }
 @end lilypond
 
+@item
+Dominant thirteenth
+@tab
+Dominant ninth, major thirteenth
+@tab
+@code{13}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:13
+}
+@end lilypond
+
 @item
 Dominant thirteenth
 @tab
@@ -310,7 +343,7 @@ Dominant eleventh, major thirteenth
 @tab
 @code{13.11}
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
   c1:13.11
 }
@@ -319,11 +352,11 @@ Dominant eleventh, major thirteenth
 @item
 Major thirteenth
 @tab
-TODO
+Major eleventh, major thirteenth
 @tab
 @code{maj13.11}
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
   c1:maj13.11
 }
@@ -332,11 +365,11 @@ TODO
 @item
 Minor thirteenth
 @tab
-TODO
+Minor eleventh, major thirteenth
 @tab
 @code{m13.11}
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
   c1:m13.11
 }
@@ -345,11 +378,11 @@ TODO
 @item
 Suspended second
 @tab
-TODO
+Major second, perfect fifth
 @tab
 @code{sus2}
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
   c1:sus2
 }
@@ -358,11 +391,11 @@ TODO
 @item
 Suspended fourth
 @tab
-TODO
+Perfect fourth, perfect fifth
 @tab
 @code{sus4}
 @tab
-@lilypond[line-width=3\cm,noragged-right]
+@lilypond[line-width=3\cm,noragged-right, notime]
 \chordmode {
   c1:sus4
 }
@@ -371,6 +404,13 @@ TODO
 
 @end multitable
 
+@node Predefined fretboard diagrams
+@appendixsec Predefined fretboard diagrams
+
+The chart below shows the predefined fretboard diagrams.
+
+@lilypondfile{display-predefined-fretboards.ly}
+
 @node MIDI instruments
 @appendixsec MIDI instruments
 
@@ -535,7 +575,262 @@ 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{Formatting text}.
 
-@lilypondfile[noindent]{font-table.ly}
+
+@menu
+* Font Clefs::                  
+* Font Time Signatures::        
+* Font Numbers::                
+* Font Accidentals::            
+* Font Default Noteheads::      
+* Font Special Noteheads::      
+* Font Shape-note Noteheads::   
+* Font Rests::                  
+* Font Flags::                  
+* Font Dots::                   
+* Font Dynamics::               
+* Font Scripts::                
+* Font Arrowheads::             
+* Font Bracket-tips::           
+* Font Pedal::                  
+* Font Accordion::              
+* Font Vaticana::               
+* Font Medicaea::               
+* Font Hufnagel::               
+* Font Mensural::               
+* Font Neomensural::            
+* Font Petrucci::               
+* Font Solesmes::               
+@end menu
+
+
+@node Font Clefs
+@unnumberedsubsec Font Clefs
+
+@lilypond[quote]
+\include "font-table.ly"
+\markuplines \override-lines #'(word-space . 4)
+             \doc-chars #clefs
+@end lilypond
+
+
+@node Font Time Signatures
+@unnumberedsubsec Font Time Signatures
+
+@lilypond[quote]
+\include "font-table.ly"
+\markuplines \override-lines #'(word-space . 4)
+             \doc-chars #timesig
+@end lilypond
+
+
+@node Font Numbers
+@unnumberedsubsec Font Numbers
+
+@lilypond[quote]
+\include "font-table.ly"
+\markuplines \override-lines #'(word-space . 4)
+             \doc-chars #numbers
+@end lilypond
+
+
+@node Font Accidentals
+@unnumberedsubsec Font Accidentals
+
+@lilypond[quote]
+\include "font-table.ly"
+\markuplines \override-lines #'(word-space . 4)
+             \doc-chars #accidentals
+@end lilypond
+
+
+@node Font Default Noteheads
+@unnumberedsubsec Font Default Noteheads
+
+@lilypond[quote]
+\include "font-table.ly"
+\markuplines \override-lines #'(word-space . 4)
+             \doc-chars #default-noteheads
+@end lilypond
+
+
+@node Font Special Noteheads
+@unnumberedsubsec Font Special Noteheads
+
+@lilypond[quote]
+\include "font-table.ly"
+\markuplines \override-lines #'(word-space . 4)
+             \doc-chars #special-noteheads
+@end lilypond
+
+
+@node Font Shape-note Noteheads
+@unnumberedsubsec Font Shape-note Noteheads
+
+@lilypond[quote]
+\include "font-table.ly"
+\markuplines \override-lines #'(word-space . 4)
+             \doc-chars #shape-note-noteheads
+@end lilypond
+
+
+@node Font Rests
+@unnumberedsubsec Font Rests
+
+@lilypond[quote]
+\include "font-table.ly"
+\markuplines \override-lines #'(word-space . 4)
+             \doc-chars #rests
+@end lilypond
+
+
+@node Font Flags
+@unnumberedsubsec Font Flags
+
+@lilypond[quote]
+\include "font-table.ly"
+\markuplines \override-lines #'(word-space . 4)
+             \doc-chars #flags
+@end lilypond
+
+
+@node Font Dots
+@unnumberedsubsec Font Dots
+
+@lilypond[quote]
+\include "font-table.ly"
+\markuplines \override-lines #'(word-space . 4)
+             \doc-chars #dots
+@end lilypond
+
+
+@node Font Dynamics
+@unnumberedsubsec Font Dynamics
+
+@lilypond[quote]
+\include "font-table.ly"
+\markuplines \override-lines #'(word-space . 4)
+             \doc-chars #dynamics
+@end lilypond
+
+
+@node Font Scripts
+@unnumberedsubsec Font Scripts
+
+@lilypond[quote]
+\include "font-table.ly"
+\markuplines \override-lines #'(word-space . 4)
+             \doc-chars #scripts
+@end lilypond
+
+
+@node Font Arrowheads
+@unnumberedsubsec Font Arrowheads
+
+@lilypond[quote]
+\include "font-table.ly"
+\markuplines \override-lines #'(word-space . 4)
+             \doc-chars #arrowheads
+@end lilypond
+
+
+@node Font Bracket-tips
+@unnumberedsubsec Font Bracket-tips
+
+@lilypond[quote]
+\include "font-table.ly"
+\markuplines \override-lines #'(word-space . 4)
+             \doc-chars #brackettips
+@end lilypond
+
+
+@node Font Pedal
+@unnumberedsubsec Font Pedal
+
+@lilypond[quote]
+\include "font-table.ly"
+\markuplines \override-lines #'(word-space . 4)
+             \doc-chars #pedal
+@end lilypond
+
+
+@node Font Accordion
+@unnumberedsubsec Font Accordion
+
+@lilypond[quote]
+\include "font-table.ly"
+\markuplines \override-lines #'(word-space . 4)
+             \doc-chars #accordion
+@end lilypond
+
+
+@node Font Vaticana
+@unnumberedsubsec Font Vaticana
+
+@lilypond[quote]
+\include "font-table.ly"
+\markuplines \override-lines #'(word-space . 4)
+             \doc-chars #vaticana
+@end lilypond
+
+
+@node Font Medicaea
+@unnumberedsubsec Font Medicaea
+
+@lilypond[quote]
+\include "font-table.ly"
+\markuplines \override-lines #'(word-space . 4)
+             \doc-chars #medicaea
+@end lilypond
+
+
+@node Font Hufnagel
+@unnumberedsubsec Font Hufnagel
+
+@lilypond[quote]
+\include "font-table.ly"
+\markuplines \override-lines #'(word-space . 4)
+             \doc-chars #hufnagel
+@end lilypond
+
+
+@node Font Mensural
+@unnumberedsubsec Font Mensural
+
+@lilypond[quote]
+\include "font-table.ly"
+\markuplines \override-lines #'(word-space . 4)
+             \doc-chars #mensural
+@end lilypond
+
+
+@node Font Neomensural
+@unnumberedsubsec Font Neomensural
+
+@lilypond[quote]
+\include "font-table.ly"
+\markuplines \override-lines #'(word-space . 4)
+             \doc-chars #neomensural
+@end lilypond
+
+
+@node Font Petrucci
+@unnumberedsubsec Font Petrucci
+
+@lilypond[quote]
+\include "font-table.ly"
+\markuplines \override-lines #'(word-space . 4)
+             \doc-chars #petrucci
+@end lilypond
+
+
+@node Font Solesmes
+@unnumberedsubsec Font Solesmes
+
+@lilypond[quote]
+\include "font-table.ly"
+\markuplines \override-lines #'(word-space . 4)
+             \doc-chars #solesmes
+@end lilypond
 
 
 @node Note head styles
@@ -585,8 +880,13 @@ The following styles may be used for note heads.
 
 Here is a chart showing all scripts available,
 
-@lilypondfile[ragged-right,quote]{script-chart.ly}
+@lilypondfile[quote]{script-chart.ly}
+
+
+@node Percussion notes
+@appendixsec Percussion notes
 
+@lilypondfile[quote]{percussion-chart.ly}
 
 
 @node All context properties