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 54bb6681bf588d992dc0c5faf19487f46f9a1fb6..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
@@ -138,7 +152,10 @@ voiceNeutralStyle = {
   \revert Beam #'color
 }
 
-       
+teeny = {
+  \set fontSize = #-3
+}
+
 tiny = {
   \set fontSize = #-2
 }
@@ -180,6 +197,17 @@ textLengthOff = {
   \override TextScript  #'infinite-spacing-height = ##f
 }
 
+balloonLengthOn = {
+  \override BalloonTextItem #'extra-spacing-width = #'(0 . 0)
+  \override BalloonTextItem #'infinite-spacing-height = ##t
+}
+
+balloonLengthOff = {
+  \override BalloonTextItem #'extra-spacing-width = #'(+inf.0 . -inf.0)
+  \override BalloonTextItem #'infinite-spacing-height = ##f
+}
+
+
 showStaffSwitch = \set followVoice = ##t
 hideStaffSwitch = \set followVoice = ##f
 
@@ -191,6 +219,14 @@ compressFullBarRests = {
   \set Score.skipBars = ##t
 }
 
+numericTimeSignature = {
+  \override Staff.TimeSignature #'style = #'()
+}
+
+defaultTimeSignature = {
+  \revert Staff.TimeSignature #'style
+}
+
 
 % For drawing vertical chord brackets with \arpeggio
 % This is a shorthand for the value of the print-function property 
@@ -199,21 +235,24 @@ compressFullBarRests = {
 
 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)
 
@@ -275,3 +314,26 @@ textSpannerDown = \override TextSpanner #'direction = #DOWN
 textSpannerNeutral = \revert TextSpanner #'direction
 
 
+
+bassFigureExtendersOn = {
+  \set useBassFigureExtenders = ##t
+  \set Staff.useBassFigureExtenders = ##t
+}
+
+bassFigureExtendersOff = {
+  \set useBassFigureExtenders = ##f
+  \set Staff.useBassFigureExtenders = ##f
+}
+
+bassFigureStaffAlignmentDown = {
+  \override Staff.BassFigureAlignmentPositioning #'direction = #DOWN
+}
+
+bassFigureStaffAlignmentUp = {
+  \override Staff.BassFigureAlignmentPositioning #'direction = #UP
+}
+
+bassFigureStaffAlignmentNeutral = {
+  \revert Staff.BassFigureAlignmentPositioning #'direction
+}
+