Merge branch 'master' into lilypond/translation

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

diff --git a/Documentation/notation/notation-appendices.itely b/Documentation/notation/notation-appendices.itely
index 02113dca11f6e6eaa94534370c6da071116ccb14..53c75c035164c5ff42e65954a38f8d7c6c004365 100644 (file)
--- a/Documentation/notation/notation-appendices.itely
+++ b/Documentation/notation/notation-appendices.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.13.36"
+@c \version "2.14.0"
 
 @node Notation manual tables
 @appendix Notation manual tables
@@ -16,6 +16,7 @@
 @menu
 * Chord name chart::
 * Common chord modifiers::
+* Predefined string tunings::
 * Predefined fretboard diagrams::
 * MIDI instruments::
 * List of colors::
@@ -29,6 +30,7 @@
 * All context properties::
 * Layout properties::
 * Available music functions::
+* Context modification identifiers::
 * Predefined type predicates::
 * Scheme functions::
 @end menu
@@ -416,6 +418,13 @@ Perfect fifth, octave
 
 @end multitable
 
+@node Predefined string tunings
+@appendixsec Predefined string tunings
+
+The chart below shows the predefined string tunings.
+
+@lilypondfile{display-predefined-string-tunings.ly}
+
 @node Predefined fretboard diagrams
 @appendixsec Predefined fretboard diagrams
 
@@ -427,6 +436,10 @@ The chart below shows the predefined fretboard diagrams for ukulele.
 
 @lilypondfile{display-predefined-ukulele-fretboards.ly}
 
+The chart below shows the predefined fretboard diagrams for mandolin.
+
+@lilypondfile{display-predefined-mandolin-fretboards.ly}
+
 @node MIDI instruments
 @appendixsec MIDI instruments
 
@@ -614,6 +627,7 @@ see @ref{Formatting text}.
 * Bracket-tip glyphs::
 * Pedal glyphs::
 * Accordion glyphs::
+* Tie glyphs::
 * Vaticana glyphs::
 * Medicaea glyphs::
 * Hufnagel glyphs::
@@ -784,6 +798,16 @@ see @ref{Formatting text}.
 @end lilypond
 
 
+@node Tie glyphs
+@unnumberedsubsec Tie glyphs
+
+@lilypond[quote]
+\include "font-table.ly"
+\markuplines \override-lines #'(word-space . 4)
+             \doc-chars #ties
+@end lilypond
+
+
 @node Vaticana glyphs
 @unnumberedsubsec Vaticana glyphs
 
@@ -1263,7 +1287,7 @@ These are variables defined directly in Scheme.  Their direct
 use by users is strongly discouraged, because their scoping
 semantics can be confusing.
 
-When the value of such a variable is changed in a @code{.ly} file,
+When the value of such a variable is changed in a @file{.ly} file,
 the change is global, and unless explicitly reverted, the new value
 will persist to the end of the file, affecting subsequent
 @code{\score} blocks as well as external files added with the
@@ -1363,6 +1387,13 @@ Internals Reference:
 
 @include identifiers.tely
 
+@node Context modification identifiers
+@appendixsec Context modification identifiers
+
+The following commands are defined for use as context modifications
+within a @code{\layout} or @code{\with} block.
+
+@include context-mod-identifiers.tely
 
 @node Predefined type predicates
 @appendixsec Predefined type predicates