X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fuser%2Fnotation-appendices.itely;h=8c6bc0618f57d1c58302b3ad18da9fff9670ba59;hb=52030cc0ba0f7b15c07e57b6e622030c1ea6c40d;hp=32afbd6f1bf2e9df3ddc562e8a450eb1c8ea305a;hpb=9e69cb84d6ee5b0a861cd97869b10e3bdf0c833c;p=lilypond.git

diff --git a/Documentation/user/notation-appendices.itely b/Documentation/user/notation-appendices.itely
index 32afbd6f1b..8c6bc0618f 100644
--- a/Documentation/user/notation-appendices.itely
+++ b/Documentation/user/notation-appendices.itely
@@ -1,14 +1,51 @@
 @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
+
+@c \version "2.11.61"
 
 @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::      
+* Predefined fretboard diagrams::  
 * MIDI instruments::            
 * List of colors::              
 * The Feta font::               
+* Note head styles::            
+* Text markup commands::        
+* Text markup list commands::
+* List of articulations::       
+* Percussion notes::            
+* All context properties::      
+* Layout properties::           
+* Identifiers::                 
+* Scheme functions::            
 @end menu
 
 
@@ -21,6 +58,346 @@ names, along with the pitches they represent.
 
 @lilypondfile{chord-names-jazz.ly}
 
+@node Common chord modifiers
+@appendixsec Common chord modifiers
+
+The following table shows chord modifiers that can be used in
+@code{\chordmode} to generate standard chord structures.
+
+@multitable @columnfractions .2 .3 .2 .2
+
+@item
+@b{Chord type}
+@tab
+@b{Intervals}
+@tab
+@b{Modifier(s)}
+@tab
+@b{Example}
+
+
+@item
+Major
+@tab
+Major third, perfect fifth
+@tab
+@code{5} or nothing
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:5
+}
+@end lilypond
+
+@item
+Minor
+@tab
+Minor third, perfect fifth
+@tab
+@code{m} or @code{m5}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:m
+}
+@end lilypond
+
+@item
+Augmented
+@tab
+Major third, augmented fifth
+@tab
+@code{aug}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:aug
+}
+@end lilypond
+
+@item
+Diminished
+@tab
+Minor third, diminished fifth
+@tab
+@code{dim}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:dim
+}
+@end lilypond
+
+@item
+Dominant seventh
+@tab
+Major triad, minor seventh
+@tab
+@code{7}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:7
+}
+@end lilypond
+
+@item
+Major seventh
+@tab
+Major triad, major seventh
+@tab
+@code{maj7} or @code{maj}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:maj7
+}
+@end lilypond
+
+@item
+Minor seventh
+@tab
+Minor triad, minor seventh
+@tab
+@code{m7}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:m7
+}
+@end lilypond
+
+@item
+Diminished seventh
+@tab
+Diminished triad, diminished seventh
+@tab
+@code{dim7}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:dim7
+}
+@end lilypond
+
+@item
+Augmented seventh
+@tab
+Augmented triad, minor seventh
+@tab
+@code{aug7}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:aug7
+}
+@end lilypond
+
+@item
+Half-diminished seventh
+@tab
+Diminished triad, minor seventh
+@tab
+@code{dim5m7}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:dim5m7
+}
+@end lilypond
+
+@item
+Minor-major seventh
+@tab
+Minor triad, major seventh
+@tab
+@code{7m5}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:7m5
+}
+@end lilypond
+
+@item
+Major sixth
+@tab
+Major triad, sixth
+@tab
+@code{6}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:6
+}
+@end lilypond
+
+@item
+Minor sixth
+@tab
+Minor triad, sixth
+@tab
+@code{m6}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:m6
+}
+@end lilypond
+
+@item
+Dominant ninth
+@tab
+Dominant seventh, major ninth
+@tab
+@code{9}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:9
+}
+@end lilypond
+
+@item
+Major ninth
+@tab
+TODO
+@tab
+@code{maj9}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:maj9
+}
+@end lilypond
+
+@item
+Minor ninth
+@tab
+TODO
+@tab
+@code{m9}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:m9
+}
+@end lilypond
+
+@item
+Dominant eleventh
+@tab
+Dominant ninth, perfect eleventh
+@tab
+@code{11}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:11
+}
+@end lilypond
+
+@item
+Major eleventh
+@tab
+TODO
+@tab
+@code{maj11}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:maj11
+}
+@end lilypond
+
+@item
+Minor eleventh
+@tab
+TODO
+@tab
+@code{m11}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:m11
+}
+@end lilypond
+
+@item
+Dominant thirteenth
+@tab
+Dominant eleventh, major thirteenth
+@tab
+@code{13.11}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:13.11
+}
+@end lilypond
+
+@item
+Major thirteenth
+@tab
+TODO
+@tab
+@code{maj13.11}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:maj13.11
+}
+@end lilypond
+
+@item
+Minor thirteenth
+@tab
+TODO
+@tab
+@code{m13.11}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:m13.11
+}
+@end lilypond
+
+@item
+Suspended second
+@tab
+TODO
+@tab
+@code{sus2}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:sus2
+}
+@end lilypond
+
+@item
+Suspended fourth
+@tab
+TODO
+@tab
+@code{sus4}
+@tab
+@lilypond[line-width=3\cm,noragged-right, notime]
+\chordmode {
+  c1:sus4
+}
+@end lilypond
+
+
+@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
 
@@ -96,13 +473,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:
@@ -183,21 +560,87 @@ 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}
 
 
-@ignore
-@n ode All context properties
-@a ppendixsec All context properties
+@node Note head styles
+@appendixsec Note head styles
 
-@i nclude context-properties.tely
+@cindex note head styles
+The following styles may be used for note heads.
 
+@lilypondfile[noindent]{note-head-style.ly}
 
-@n ode Layout properties
-@ap pendixsec Layout properties
+@include markup-commands.tely
 
-@in clude layout-properties.tely
+@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[quote]{script-chart.ly}
+
+
+@node Percussion notes
+@appendixsec Percussion notes
+
+@lilypondfile[quote]{percussion-chart.ly}
+
+
+@node All context properties
+@appendixsec All context properties
+
+@include context-properties.tely
+
+
+@node Layout properties
+@appendixsec Layout properties
+
+@include layout-properties.tely
+
+
+@node Identifiers
+@appendixsec Identifiers
+
+@include identifiers.tely
+
+
+@node Scheme functions
+@appendixsec Scheme functions
+
+@include scheme-functions.tely
 
-@end ignore