* ly/property-init.ly (setMmRestFermata): added.

* Documentation/user/refman.itely (Multi measure rests): fermatas
on mm rests.

* input/regression/apply-context.ly (texidoc): new file

diff --git a/ChangeLog b/ChangeLog
index 235a726efb26d79867c61a428c889ab272127b33..07dd8ec1385ce47cd6c8725c231a31d2e9f7e03a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2002-11-19  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * ly/property-init.ly (setMmRestFermata): added.
+
+       * Documentation/user/refman.itely (Multi measure rests): fermatas
+       on mm rests.
+
        * input/regression/apply-context.ly (texidoc): new file
 
        * lily/parser.yy (Simple_music): \applycontext #FUNCTION allows

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index afa7f51015dfd3aa763c8f810cc6c92ab59f1087..8cb5be61a719c8507419a42cb878b8456eaf470c 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -3585,11 +3585,10 @@ effect music that appears inside a @code{\transpose}.
 
 Multi measure rests are entered using `@code{R}'. It is specifically
 meant for full bar rests and for entering parts: the rest can expand to
-fill a score with 
-rests, or it can be printed as a single multimeasure rest This expansion
-is controlled by the property @code{Score.skipBars}. If this is set to true,
-Lily will not expand empty measures, and the appropriate number is added
-automatically.
+fill a score with rests, or it can be printed as a single multimeasure
+rest This expansion is controlled by the property
+@code{Score.skipBars}. If this is set to true, Lily will not expand
+empty measures, and the appropriate number is added automatically.
 
 @lilypond[fragment,verbatim]
  \time 4/4 r1 | R1 | R1*2
@@ -3617,14 +3616,29 @@ rest centered in the measure, regardless of the time signature.
 
 @cindex whole rests for a full measure 
 
-The object for this object is @internalsref{MultiMeasureRest}.
+The object for this object is @internalsref{MultiMeasureRest}, and
+@internalsref{MultiMeasureRestNumber}.
 
 @refbugs
 
 Currently, there is no way to automatically condense multiple rests
 into a single multimeasure rest. Multi measure rests do not take part
-in rest collisions. There is no way to put texts centered on
-multi-measure rests.
+in rest collisions.
+
+Multi-measure rests do not accept @var{note}-@code{text} syntax for
+putting texts and scripts on the rest.  This has to be done by setting
+@code{#'text} in @internalsref{MultiMeasureRestNumber}. An identifier is
+provided for a fermata:
+
+@cindex text on multi-measure rest
+@cindex script on multi-measure rest
+@cindex fermata on multi-measure rest
+
+@lilypond[verbatim,fragment]
+  \time 3/4
+  \setMmRestFermata R2.
+@end lilypond
+
 
 @cindex condensing rests
 

diff --git a/input/regression/apply-context.ly b/input/regression/apply-context.ly
new file mode 100644 (file)
index 0000000..2cf54b1
--- /dev/null
+++ b/input/regression/apply-context.ly
@@ -0,0 +1,22 @@
+\header {
+
+texidoc = "with \\applycontext, \\properties can be modified
+procedurally. Applications include: checking bar numbers, smart
+octavation. "
+
+}
+
+\score { \notes \relative c'' {
+    c1 c1
+
+    %% todo: should put something interesting in the .tex output.
+    
+    \applycontext #(lambda (tr)
+                   (let* ((bn (ly:get-context-property tr 'currentBarNumber)))
+                    (if (= bn  3)
+                     #t
+                     (format #t "We were called in  ~a" bn))
+                ))
+
+    c1 c1
+}}

diff --git a/ly/property-init.ly b/ly/property-init.ly
index c035bfc3ddaed72b952476b95a8537d78b66a122..6ff4c9ceba655ce6bc9ccb4e2153a064ab9a9b5a 100644 (file)
--- a/ly/property-init.ly
+++ b/ly/property-init.ly
@@ -240,3 +240,6 @@ turnOff = #'()
 arpeggioBracket = #(lambda (grob) (Arpeggio::brew_chord_bracket grob))
 arpeggio = #(make-music-by-name 'ArpeggioEvent)
 glissando = #(make-music-by-name 'GlissandoEvent)
+
+setMmRestFermata =
+  \once \property Voice.MultiMeasureRestNumber \override #'text = #'(music "scripts-ufermata")