Doc -- modify Clef section to bring back to standards

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

diff --git a/Documentation/notation/expressive.itely b/Documentation/notation/expressive.itely
index 3145261f6dcd0173e3caf7192edecce47625124f..283608cdf16990ee542023749104895e5e0158c8 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
@@ -508,6 +528,9 @@ doits.
 
 @notation{Slurs} are entered using parentheses:
 
+@warning{In polyphonic music, a slur must be terminated
+in the same voice it began.}
+
 @lilypond[verbatim,quote,relative=2]
 f4( g a) a8 b(
 a4 g2 f4)
@@ -630,6 +653,7 @@ g4( e c2)
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
 {making-slurs-with-complex-dash-structure.ly}
 
+
 @seealso
 Music Glossary:
 @rglos{slur}.
@@ -954,10 +978,13 @@ Different types of arpeggios may be written.
 
 @lilypond[verbatim,quote,relative=1]
 <c e g c>2\arpeggio
+
 \arpeggioArrowUp
 <c e g c>2\arpeggio
+
 \arpeggioArrowDown
 <c e g c>2\arpeggio
+
 \arpeggioNormal
 <c e g c>2\arpeggio
 @end lilypond
@@ -976,12 +1003,16 @@ Special @emph{bracketed} arpeggio symbols can be created:
 
 @lilypond[verbatim,quote,relative=1]
 <c e g c>2
+
 \arpeggioBracket
 <c e g c>2\arpeggio
+
 \arpeggioParenthesis
 <c e g c>2\arpeggio
+
 \arpeggioParenthesisDashed
 <c e g c>2\arpeggio
+
 \arpeggioNormal
 <c e g c>2\arpeggio
 @end lilypond