X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fnotation%2Fexpressive.itely;h=072aa2e402ec9904bc17014f33fd1561de6aaaf8;hb=9e205dd2ae57dce8b8e3a42f86b945517374265a;hp=9aa1055493f01b41548a7fd43b50d6ef6a921a59;hpb=3dd9b13331489a191d0e901245cc98476e5fcac1;p=lilypond.git

diff --git a/Documentation/notation/expressive.itely b/Documentation/notation/expressive.itely
index 9aa1055493..072aa2e402 100644
--- a/Documentation/notation/expressive.itely
+++ b/Documentation/notation/expressive.itely
@@ -63,11 +63,57 @@ Methods to create new dynamic markings are also discussed.
 @cindex prallmordent
 @cindex prall, up
 @cindex prall, down
+@cindex mordent, up
+@cindex mordent, down
 @cindex thumb marking
 @cindex segno
 @cindex coda
 @cindex varcoda
 
+@funindex \accent
+@funindex \marcato
+@funindex \staccatissimo
+@funindex \espressivo
+@funindex \staccato
+@funindex \tenuto
+@funindex \portato
+@funindex \upbow
+@funindex \downbow
+@funindex \flageolet
+@funindex \thumb
+@funindex \lheel
+@funindex \rheel
+@funindex \ltoe
+@funindex \rtoe
+@funindex \open
+@funindex \halfopen
+@funindex \stopped
+@funindex \snappizzicato
+@funindex \turn
+@funindex \reverseturn
+@funindex \trill
+@funindex \prall
+@funindex \mordent
+@funindex \prallprall
+@funindex \prallmordent
+@funindex \upprall
+@funindex \downprall
+@funindex \upmordent
+@funindex \downmordent
+@funindex \pralldown
+@funindex \prallup
+@funindex \lineprall
+@funindex \signumcongruentiae
+@funindex \shortfermata
+@funindex \fermata
+@funindex \longfermata
+@funindex \verylongfermata
+@funindex \fermataMarkup
+@funindex \segno
+@funindex \coda
+@funindex \varcoda
+
+
 @funindex -
 
 A variety of symbols that denote articulations, ornamentations,
@@ -102,8 +148,8 @@ articulation.  Predefined shorthands exist for @notation{marcato},
 Their corresponding output appears as follows:
 
 @lilypond[verbatim,quote,relative=2]
-c4-^  c-+  c--  c-|
-c4->  c-.  c2-_
+c4-^ c-+ c-- c-|
+c4-> c-. c2-_
 @end lilypond
 
 The rules for the default placement of articulations are defined
@@ -114,6 +160,19 @@ may be manually placed above or below the staff; see
 Articulations are @code{Script} objects.  Their properties are
 described more fully in @rinternals{Script}.
 
+Articulations can be attached to rests as well as notes but they
+cannot be attached to multi-measure rests.  A special predefined
+command, @code{\fermataMarkup}, is available for attaching a fermata
+to a multi-measure rest (and only a multi-measure rest).  This
+creates a @code{MultiMeasureRestText} object.
+
+@lilypond[verbatim,quote,relative=2]
+\override Script #'color = #red
+\override MultiMeasureRestText #'color = #blue
+a2\fermata r\fermata
+R1\fermataMarkup
+@end lilypond
+
 In addition to articulations, text and markups can be attached to
 notes.  See @ref{Text scripts}.
 
@@ -292,9 +351,9 @@ 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 @code{\crescTextCresc}, 
-@code{\dimTextDecresc}, @code{\dimTextDecr}, and @code{\dimTextDim} 
-will tell LilyPond to use such textual marks instead of hairpins 
+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:
@@ -423,7 +482,8 @@ brackets) can be created.  The syntax for markup mode is described
 in @ref{Formatting text}.
 
 @lilypond[verbatim,quote]
-roundF = \markup { \center-align \concat { \bold { \italic ( }
+roundF = \markup {
+    \center-align \concat { \bold { \italic ( }
            \dynamic f \bold { \italic ) } } }
 boxF = \markup { \bracket { \dynamic f } }
 \relative c' {
@@ -469,9 +529,9 @@ mfEspressDynamic = #(make-dynamic-script mfEspress)
 \relative c' {
   c4_\roundFdynamic\< d e f
   g,1~_\boxFdynamic\>
-  g
-  g'~\mfEspressDynamic
-  g
+  g1
+  g'1~\mfEspressDynamic
+  g1
 }
 @end lilypond
 
@@ -503,7 +563,7 @@ Snippets:
 @rlsr{Expressive marks}.
 
 Extend:
-@rextend{Markup construction in Scheme},
+@rextend{Markup construction in Scheme}.
 
 
 
@@ -764,7 +824,7 @@ g4\( e c2\)
 @funindex phrasingSlurDashPattern
 @cindex phrasing slur, defining dash patterns
 @cindex slur, phrasing, defining dash patterns
-@cindex slur, definind dash patterns for phrasing
+@cindex slur, defining dash patterns for phrasing
 
 Custom dash patterns for phrasing slurs can be defined:
 
@@ -824,6 +884,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}.
 
@@ -851,7 +918,9 @@ Snippets:
 @rlsr{Expressive marks}.
 
 Internals Reference:
-@rinternals{BreathingSign}.
+@rinternals{BreathingEvent},
+@rinternals{BreathingSign},
+@rinternals{Breathing_sign_engraver}.
 
 
 @node Falls and doits
@@ -871,6 +940,8 @@ indicates the pitch interval that the fall or doit will extend
 @lilypond[verbatim,quote,relative=2]
 c2-\bendAfter #+4
 c2-\bendAfter #-4
+c2-\bendAfter #+6.5
+c2-\bendAfter #-6.5
 c2-\bendAfter #+8
 c2-\bendAfter #-8
 @end lilypond
@@ -1090,26 +1161,50 @@ cross-staff arpeggios.
 @funindex \stopTrillSpan
 @funindex stopTrillSpan
 
-Short @notation{trills} without an extender line are printed with
+Short trills without an extender line are printed with
 @code{\trill}; see @ref{Articulations and ornamentations}.
 
 Longer trills with an extender line are made with
 @code{\startTrillSpan} and @code{\stopTrillSpan}:
 
 @lilypond[verbatim,quote,relative=2]
-d1~\startTrillSpan
+d1\startTrillSpan
 d1
-c2\stopTrillSpan r2
+c2\stopTrillSpan
+r2
 @end lilypond
 
-In the following example, a trill is combined with grace notes.
-The syntax of this construct and the method to precisely position
-the grace notes are described in @ref{Grace notes}.
+A trill spanner crossing a line break will restart exactly above
+the first note on the new line.
+
+@lilypond[ragged-right,verbatim,quote,relative=2]
+d1\startTrillSpan
+\break
+d1
+c2\stopTrillSpan
+r2
+@end lilypond
+
+Consecutive trill spans will work without explicit
+@code{\stopTrillSpan} commands, since successive trill spanners will
+automatically become the right bound of the previous trill.
+
+@lilypond[verbatim,quote,relative=2]
+d1\startTrillSpan
+d1
+b1\startTrillSpan
+d2\stopTrillSpan
+r2
+@end lilypond
+
+Trills can also be combined with grace notes.  The syntax of this
+construct and the method to precisely position the grace notes are
+described in @ref{Grace notes}.
 
 @lilypond[verbatim,quote,relative=2]
-c1 \afterGrace
+d1~\afterGrace
 d1\startTrillSpan { c32[ d]\stopTrillSpan }
-e2 r2
+c2 r2
 @end lilypond
 
 @cindex pitched trills
@@ -1122,29 +1217,34 @@ be typeset with the @code{\pitchedTrill} command.  The first
 argument is the main note, and the second is the @emph{trilled}
 note, printed as a stemless note head in parentheses.
 
-@lilypond[verbatim,quote,relative=1]
-\pitchedTrill e2\startTrillSpan fis
-d\stopTrillSpan
+@lilypond[verbatim,quote,relative=2]
+\pitchedTrill
+d2\startTrillSpan fis
+d2
+c2\stopTrillSpan
+r2
 @end lilypond
 
-@cindex pitched trill with forced accidental
-@cindex trill, pitched with forced accidental
-@cindex accidental, forced for pitched trill
+@cindex pitched trill with accidental
+@cindex trill with accidental
 
-In the following example, the second pitched trill is ambiguous;
-the accidental of the trilled note is not printed.  As a
-workaround, the accidentals of the trilled notes can be forced.
-The second measure illustrates this method:
+Subsequent accidentals of the same note in the same measure will need
+to be added manually.  Only the accidental of the first pitched trill
+in a measure is printed.
 
 @lilypond[verbatim,quote,relative=2]
-\pitchedTrill eis4\startTrillSpan fis
-g\stopTrillSpan
-\pitchedTrill eis4\startTrillSpan fis
-g\stopTrillSpan
-\pitchedTrill eis4\startTrillSpan fis
-g\stopTrillSpan
-\pitchedTrill eis4\startTrillSpan fis!
-g\stopTrillSpan
+\pitchedTrill
+eis4\startTrillSpan fis
+eis4\stopTrillSpan
+\pitchedTrill
+eis4\startTrillSpan cis
+eis4\stopTrillSpan
+\pitchedTrill
+eis4\startTrillSpan fis
+eis4\stopTrillSpan
+\pitchedTrill
+eis4\startTrillSpan fis!
+eis4\stopTrillSpan
 @end lilypond
 
 
@@ -1153,7 +1253,6 @@ g\stopTrillSpan
 @code{\stopTrillSpan}.
 @endpredefined
 
-
 @seealso
 Music Glossary:
 @rglos{trill}.