From: Trevor Daniels <t.daniels@treda.co.uk>
Date: Fri, 4 Sep 2009 21:28:00 +0000 (+0100)
Subject: Reduce 'outside-staff-priority of fermata over full measure rests
X-Git-Tag: release/2.13.4-1~77
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1aa44fb449c11ff55553621eb1bbb2f33b37dba3;p=lilypond.git

Reduce 'outside-staff-priority of fermata over full measure rests

 - keep a fermata placed over a multi-measure rest
   close to the staff, in particular ensure it is
   not displaced upwards by TextScripts

 - add regression test for this and for inverting fermata
   glyph when placed under the staff
---

diff --git a/input/regression/full-measure-rest-fermata.ly b/input/regression/full-measure-rest-fermata.ly
new file mode 100644
index 0000000000..71c62cf8fa
--- /dev/null
+++ b/input/regression/full-measure-rest-fermata.ly
@@ -0,0 +1,25 @@
+\version "2.12.4"
+
+\header{
+  texidoc="
+Fermata over full-measure rests should invert when below and
+be closer to the staff than other articulations."
+}
+\layout {
+  ragged-right = ##t
+}
+\relative c'' {
+  R1
+  a1^"should be lower"
+  R1^"should be higher"
+  \break
+  R1
+  R1^"should be lower"
+  a1^"should be higher"
+  \break
+  a1^"should be above fermata"
+  R1^\fermataMarkup
+  \break
+  a1_"should be below fermata"
+  R1_\fermataMarkup
+}
diff --git a/ly/property-init.ly b/ly/property-init.ly
index 1ab7d5e5d9..2880bffb2f 100644
--- a/ly/property-init.ly
+++ b/ly/property-init.ly
@@ -172,11 +172,13 @@ endincipit = \context Staff {
 
 fermataMarkup =
 #(make-music 'MultiMeasureTextEvent
-   ; Set the 'text based on the 'direction
-   'tweaks (list (cons 'text (lambda (grob)
-       (if (eq? (ly:grob-property grob 'direction) DOWN)
-	   (markup #:musicglyph "scripts.dfermata")
-	   (markup #:musicglyph "scripts.ufermata"))))))
+   'tweaks (list
+             ; Set the 'text based on the 'direction
+             (cons 'text (lambda (grob)
+               (if (eq? (ly:grob-property grob 'direction) DOWN)
+	         (markup #:musicglyph "scripts.dfermata")
+	         (markup #:musicglyph "scripts.ufermata"))))
+             (cons 'outside-staff-priority 40)))
 
 
 %% font sizes