Merge branch 'lilypond/translation' of ssh://git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / Documentation / notation / expressive.itely

diff --git a/Documentation/notation/expressive.itely b/Documentation/notation/expressive.itely
index 161a6d4ed3014b346741df22f2d704633f8c6db5..0763f6f0d2afd5cfea7de74584eb715a15c3fe35 100644 (file)
--- a/Documentation/notation/expressive.itely
+++ b/Documentation/notation/expressive.itely
@@ -3,7 +3,8 @@
     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.
+    version that you are working on.  For details, see the Contributors'
+    Guide, node Updating translation committishes..
 @end ignore
 
 @c \version "2.12.0"
@@ -110,6 +111,14 @@ in @file{scm/@/script@/.scm}.  Articulations and ornamentations
 may be manually placed above or below the staff; see
 @ref{Direction and placement}.
 
+Articulations are @code{Script} objects.  Their properties are
+described more fully in @rinternals{Script}.
+
+In addition to articulations, text and markups can be attached to
+notes.  See @ref{Text scripts}.
+
+For more information about the ordering of Scripts and TextScripts that
+are attached to the notes, see @rlearning{Placement of objects}.
 
 @snippets
 
@@ -129,7 +138,12 @@ Music Glossary:
 @rglos{staccato},
 @rglos{portato}.
 
+Learning Manual:
+@rlearning{Placement of objects}.
+
+
 Notation Reference:
+@ref{Text scripts},
 @ref{Direction and placement},
 @ref{List of articulations},
 @ref{Trills}.
@@ -174,6 +188,8 @@ Internals Reference:
 @funindex fff
 @funindex \ffff
 @funindex ffff
+@funindex \fffff
+@funindex fffff
 @funindex \fp
 @funindex fp
 @funindex \sf
@@ -276,9 +292,10 @@ g1\espressivo
 
 Crescendos and decrescendos can be engraved as textual markings
 instead of hairpins.  Dashed lines are printed to indicate their
-extent.  The built-in commands that enable these text modes are
-@code{\crescTextCresc}, @code{\dimTextDecresc},
-@code{\dimTextDecr}, and @code{\dimTextDim}.  The corresponding
+extent.  The built-in commands @code{\crescTextCresc}, 
+@code{\dimTextDecresc}, @code{\dimTextDecr}, and @code{\dimTextDim} 
+will tell LilyPond to use such textual marks instead of hairpins 
+for all subsequent @code{\<} and @code{\>} commands.  The corresponding
 @code{\crescHairpin} and @code{\dimHairpin} commands will revert
 to hairpins again:
 
@@ -459,7 +476,7 @@ mfEspressDynamic = #(make-dynamic-script mfEspress)
 @end lilypond
 
 The Scheme form of markup mode may be used instead.  Its syntax is
-explained in @ref{Markup construction in Scheme}.
+explained in @rextend{Markup construction in Scheme}.
 
 @lilypond[verbatim,quote]
 moltoF = #(make-dynamic-script
@@ -479,13 +496,16 @@ Font settings in markup mode are described in
 Notation Reference:
 @ref{Formatting text},
 @ref{Selecting font and font size},
-@ref{Markup construction in Scheme},
 @ref{What goes into the MIDI output?},
 @ref{Controlling MIDI dynamics}.
 
 Snippets:
 @rlsr{Expressive marks}.
 
+Extend:
+@rextend{Markup construction in Scheme}.
+
+
 
 @node Curves
 @subsection Curves
@@ -804,6 +824,13 @@ Breath marks are entered using @code{\breathe}:
 c2. \breathe d4
 @end lilypond
 
+A breath mark will end an automatic beam; to override this behavior, see
+@ref{Manual beams}.
+
+@lilypond[verbatim,quote,relative=2]
+c8 \breathe d e f g2
+@end lilypond
+
 Musical indicators for breath marks in ancient notation,
 divisiones, are supported.  For details, see @ref{Divisiones}.
 
@@ -831,7 +858,9 @@ Snippets:
 @rlsr{Expressive marks}.
 
 Internals Reference:
-@rinternals{BreathingSign}.
+@rinternals{BreathingEvent},
+@rinternals{BreathingSign},
+@rinternals{Breathing_sign_engraver}.
 
 
 @node Falls and doits