Fix 1289 -- Disable autobeaming in cadenzas and reenable it afterward

diff --git a/Documentation/notation/rhythms.itely b/Documentation/notation/rhythms.itely
index 3f3b1e9aa381c91eb45eac46536a3e4d2607bb77..021de18eb77494c788848f590233597d930ddc4d 100644 (file)
--- a/Documentation/notation/rhythms.itely
+++ b/Documentation/notation/rhythms.itely
@@ -1365,6 +1365,24 @@ c4 c d8[ d d] f4 g4.
 d4 e d c
 @end lilypond
 
+@cindex beaming in cadenzas
+@cindex beaming in unmetered music
+@cindex cadenza, beaming in
+@cindex unmetered music, beaming in
+
+Automatic beaming is disabled by @code{\cadenzaOn} and enabled
+by @code{\cadenzaOff}.  Therefore, all beaming in cadenzas
+must be entered manually (@ref{Manual beams}).
+
+@lilypond[verbatim,relative=2,quote]
+\repeat unfold 8 {c8}
+\cadenzaOn
+\repeat unfold 5 {c8}
+\bar"|"
+\cadenzaOff
+\repeat unfold 8 {c8}
+@end lilypond
+
 Note that these predefined commands affect all staves in the
 score, even when they are placed in just one @code{Voice}
 context.  To change this, move the @code{Timing_translator}
@@ -1383,7 +1401,8 @@ Music Glossary:
 
 Notation Reference:
 @ref{Visibility of objects},
-@ref{Polymetric notation}.
+@ref{Polymetric notation},
+@ref{Manual beams}.
 
 Snippets:
 @rlsr{Rhythms}.
@@ -1412,10 +1431,6 @@ staff line, you will need to insert invisible bar lines with
 @noindent
 to indicate where breaks can occur.
 
-Automatic beaming rules are unlikely to produce the desired beams in
-cadenzas longer than one or two beats, so it is best to specify beams
-manually with @code{[} and @code{]}.
-
 You should explicitly create a @code{Voice} context when starting a
 piece with @code{\cadenzaOn}, otherwise strange errors may occur.
 

diff --git a/ly/property-init.ly b/ly/property-init.ly
index 3283df7b2e673cc763c9537809d5d547a6941118..5724004fb2e796df89b6dd04fbbfb2f1a5497169 100644 (file)
--- a/ly/property-init.ly
+++ b/ly/property-init.ly
@@ -93,10 +93,15 @@ bassFigureStaffAlignmentNeutral =
 
 %% cadenzas
 
-cadenzaOn  = \set Timing.timing = ##f
+cadenzaOn  = {
+  \set Timing.timing = ##f
+  \set Timing.autoBeaming = ##f
+}
+
 cadenzaOff = {
   \set Timing.timing = ##t
   \set Timing.measurePosition = #ZERO-MOMENT
+  \set Timing.autoBeaming = ##t
 }