Merge branch 'master' into dev/texi2html

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

diff --git a/ly/property-init.ly b/ly/property-init.ly
index b7cec45ae245e52be5cebfd0a71c82f53dd09155..f15dacf8de5b2eea1a1f8ac18b25a35fb5ba15d2 100644 (file)
--- a/ly/property-init.ly
+++ b/ly/property-init.ly
@@ -29,6 +29,20 @@ phrasingSlurUp = \override PhrasingSlur  #'direction = #UP
 phrasingSlurDown = \override PhrasingSlur  #'direction = #DOWN
 phrasingSlurNeutral = \revert PhrasingSlur #'direction
 
+mergeDifferentlyDottedOn = {
+  \override Staff.NoteCollision #'merge-differently-dotted = ##t
+}
+mergeDifferentlyDottedOff = {
+  \revert Staff.NoteCollision #'merge-differently-dotted
+}
+
+mergeDifferentlyHeadedOn = {
+  \override Staff.NoteCollision #'merge-differently-headed = ##t
+}
+mergeDifferentlyHeadedOff = {
+  \revert Staff.NoteCollision #'merge-differently-headed
+}
+
 shiftOn = \override NoteColumn  #'horizontal-shift = #1
 shiftOnn = \override NoteColumn  #'horizontal-shift = #2
 shiftOnnn = \override NoteColumn  #'horizontal-shift = #3
@@ -221,21 +235,24 @@ defaultTimeSignature = {
 
 arpeggio = #(make-music 'ArpeggioEvent)
 
-arpeggioUp = \sequential {
+arpeggioArrowUp = \sequential {
   \revert Arpeggio  #'stencil
   \override Arpeggio  #'arpeggio-direction = #UP
 }
-arpeggioDown = \sequential {
+arpeggioArrowDown = \sequential {
   \revert Arpeggio #'stencil
   \override Arpeggio  #'arpeggio-direction = #DOWN
 }
-arpeggioNeutral = \sequential {
+arpeggioNormal = \sequential {
   \revert Arpeggio #'stencil
   \revert Arpeggio  #'arpeggio-direction
 }
 arpeggioBracket = \sequential {
   \override Arpeggio #'stencil = #ly:arpeggio::brew-chord-bracket
 }
+arpeggioParenthesis = \sequential {
+  \override Arpeggio #'stencil = #ly:arpeggio::brew-chord-slur
+}
 
 glissando = #(make-music 'GlissandoEvent)