Tempo and Rehearsal marks horizontal positioning; issue 3279

[lilypond.git] / ly / property-init.ly

diff --git a/ly/property-init.ly b/ly/property-init.ly
index 2c538ce86cb8dc0c308d67ba97c807e7902bcfb8..fc7c67179a377b7e05d2e664539df5b6f97425e0 100644 (file)
--- a/ly/property-init.ly
+++ b/ly/property-init.ly
@@ -420,22 +420,22 @@ predefinedFretboardsOn =
 
 %% shape note heads
 
-aikenHeads      = \set shapeNoteStyles = #'#(do re miMirror fa sol la ti)
-aikenHeadsMinor = \set shapeNoteStyles = #'#(la ti do re miMirror fa sol)
+aikenHeads      = \set shapeNoteStyles = ##(do re miMirror fa sol la ti)
+aikenHeadsMinor = \set shapeNoteStyles = ##(la ti do re miMirror fa sol)
 funkHeads =
-  \set shapeNoteStyles = #'#(doFunk reFunk miFunk faFunk solFunk laFunk tiFunk)
+  \set shapeNoteStyles = ##(doFunk reFunk miFunk faFunk solFunk laFunk tiFunk)
 funkHeadsMinor =
-  \set shapeNoteStyles = #'#(laFunk tiFunk doFunk reFunk miFunk faFunk solFunk)
-sacredHarpHeads = \set shapeNoteStyles = #'#(fa sol la fa sol la mi)
-sacredHarpHeadsMinor = \set shapeNoteStyles = #'#(la mi fa sol la fa sol)
+  \set shapeNoteStyles = ##(laFunk tiFunk doFunk reFunk miFunk faFunk solFunk)
+sacredHarpHeads = \set shapeNoteStyles = ##(fa sol la fa sol la mi)
+sacredHarpHeadsMinor = \set shapeNoteStyles = ##(la mi fa sol la fa sol)
 southernHarmonyHeads =
-  \set shapeNoteStyles = #'#(faThin sol laThin faThin sol laThin miThin)
+  \set shapeNoteStyles = ##(faThin sol laThin faThin sol laThin miThin)
 southernHarmonyHeadsMinor =
-  \set shapeNoteStyles = #'#(laThin miThin faThin sol laThin faThin sol)
+  \set shapeNoteStyles = ##(laThin miThin faThin sol laThin faThin sol)
 walkerHeads =
-  \set shapeNoteStyles = #'#(doWalker reWalker miWalker faWalker solFunk laWalker tiWalker)
+  \set shapeNoteStyles = ##(doWalker reWalker miWalker faWalker solFunk laWalker tiWalker)
 walkerHeadsMinor =
-  \set shapeNoteStyles = #'#(laWalker tiWalker doWalker reWalker miWalker faWalker solFunk)
+  \set shapeNoteStyles = ##(laWalker tiWalker doWalker reWalker miWalker faWalker solFunk)
 
 
 %% shifts
@@ -555,12 +555,24 @@ showSplitTiedTabNotes = {
 textLengthOn = {
   \override TextScript.extra-spacing-width = #'(0 . 0)
   \override TextScript.extra-spacing-height = #'(-inf.0 . +inf.0)
+  \override TextScript.outside-staff-horizontal-padding = #0
 }
+
 textLengthOff = {
   \override TextScript.extra-spacing-width = #'(+inf.0 . -inf.0)
   \override TextScript.extra-spacing-height = #'(0 . 0)
+  \revert TextScript.outside-staff-horizontal-padding
+}
+
+markLengthOn = {
+  \override Score.MetronomeMark.extra-spacing-width = #'(-0.5 . 0.5)
+  \override Score.RehearsalMark.extra-spacing-width = #'(-0.5 . 0.5)
 }
 
+markLengthOff = {
+  \override Score.MetronomeMark.extra-spacing-width = #'(+inf.0 . -inf.0)
+  \override Score.RehearsalMark.extra-spacing-width = #'(+inf.0 . -inf.0)
+}
 
 %% text spanners