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 43008965076ad25d97a14057e2c277397af4b2c5..f15dacf8de5b2eea1a1f8ac18b25a35fb5ba15d2 100644 (file)
--- a/ly/property-init.ly
+++ b/ly/property-init.ly
@@ -1,6 +1,6 @@
 % property-init.ly
 
-\version "2.7.13"
+\version "2.11.38"
 
 stemUp = \override Stem  #'direction = #UP
 stemDown = \override Stem  #'direction = #DOWN 
@@ -8,7 +8,7 @@ stemNeutral= \revert Stem #'direction
 
 slurUp = \override Slur  #'direction = #UP
 slurDown = \override Slur  #'direction = #DOWN
-slurNeutral = \revert Slur #'direction 
+slurNeutral = \revert Slur #'direction
 
 %% There's also dash, but setting dash period/length should be fixed.
 slurDashed = {
@@ -27,16 +27,30 @@ slurSolid = {
 
 phrasingSlurUp = \override PhrasingSlur  #'direction = #UP
 phrasingSlurDown = \override PhrasingSlur  #'direction = #DOWN
-phrasingSlurNeutral = \revert PhrasingSlur #'direction 
+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
-shiftOff = \revert NoteColumn #'horizontal-shift 
+shiftOff = \revert NoteColumn #'horizontal-shift
 
 tieUp = \override Tie  #'direction = #UP
 tieDown = \override Tie  #'direction = #DOWN
-tieNeutral = \revert Tie #'direction 
+tieNeutral = \revert Tie #'direction
 
 tieDashed = {
   \override Tie #'dash-period = #0.75
@@ -51,17 +65,24 @@ tieSolid = {
   \revert Tie #'dash-fraction
 }
 
-setEasyHeads = \sequential {
-  \override NoteHead #'callbacks #'stencil = #Note_head::brew_ez_stencil
+easyHeadsOn = {
+  \override NoteHead  #'stencil = #ly:note-head::brew-ez-stencil
   \override NoteHead #'font-size = #-7
   \override NoteHead #'font-family = #'sans
   \override NoteHead #'font-series = #'bold
 }
 
+easyHeadsOff = {
+  \revert NoteHead #'stencil
+  \revert NoteHead #'font-size
+  \revert NoteHead #'font-family
+  \revert NoteHead #'font-series
+}
+
 aikenHeads = \set shapeNoteStyles = ##(do re mi fa #f la ti)
 
 sacredHarpHeads =
-  \set shapeNoteStyles = ##(#f #f mi #f fa la #f)
+  \set shapeNoteStyles = ##(fa #f la fa #f la mi)
 
 dynamicUp = {
   \override DynamicText  #'direction = #UP
@@ -90,7 +111,7 @@ tupletNeutral = \revert TupletBracket #'direction
 cadenzaOn = \set Timing.timing = ##f
 cadenzaOff = {
   \set Timing.timing = ##t
-  \set Timing.measurePosition = #(ly:make-moment 0 1)
+  \set Timing.measurePosition = #ZERO-MOMENT
 }
 
 % dynamic ly:dir?  text script, articulation script ly:dir?    
@@ -100,17 +121,60 @@ voiceTwo = #(context-spec-music (make-voice-props-set 1) 'Voice)
 voiceThree =#(context-spec-music (make-voice-props-set 2) 'Voice)
 voiceFour = #(context-spec-music (make-voice-props-set 3) 'Voice)
 
-       
-tiny = 
-\set fontSize = #-2
+voiceOneStyle = {
+  \override NoteHead #'style = #'diamond
+  \override NoteHead #'color = #red
+  \override Stem #'color = #red
+  \override Beam #'color = #red
+}
+voiceTwoStyle = {
+  \override NoteHead #'style = #'triangle
+  \override NoteHead #'color = #blue
+  \override Stem #'color = #blue
+  \override Beam #'color = #blue
+}
+voiceThreeStyle = {
+  \override NoteHead #'style = #'xcircle
+  \override NoteHead #'color = #green
+  \override Stem #'color = #green
+  \override Beam #'color = #green
+}
+voiceFourStyle = {
+  \override NoteHead #'style = #'cross
+  \override NoteHead #'color = #magenta
+  \override Stem #'color = #magenta
+  \override Beam #'color = #magenta
+}
+voiceNeutralStyle = {
+  \revert NoteHead #'style
+  \revert NoteHead #'color
+  \revert Stem #'color
+  \revert Beam #'color
+}
+
+teeny = {
+  \set fontSize = #-3
+}
 
-small = 
-\set fontSize = #-1
+tiny = {
+  \set fontSize = #-2
+}
+
+small = {
+  \set fontSize = #-1
+}
 
 normalsize = {
   \set fontSize = #0
 }
 
+large = {
+  \set fontSize = #1
+}
+
+huge = {
+  \set fontSize = #2
+}
 
 %% End the incipit and print a ``normal line start''.
 endincipit =  \context Staff {
@@ -123,12 +187,45 @@ endincipit =  \context Staff {
 autoBeamOff = \set autoBeaming = ##f
 autoBeamOn = \set autoBeaming = ##t
 
-fatText = \override TextScript  #'no-spacing-rods = ##f
-emptyText = \override TextScript  #'no-spacing-rods = ##t
+textLengthOn = {
+  \override TextScript  #'extra-spacing-width = #'(0 . 0)
+  \override TextScript  #'infinite-spacing-height = ##t
+}
+
+textLengthOff = {
+  \override TextScript  #'extra-spacing-width = #'(+inf.0 . -inf.0)
+  \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
 
+expandFullBarRests = {
+  \set Score.skipBars = ##f
+}
+
+compressFullBarRests = {
+  \set Score.skipBars = ##t
+}
+
+numericTimeSignature = {
+  \override Staff.TimeSignature #'style = #'()
+}
+
+defaultTimeSignature = {
+  \revert Staff.TimeSignature #'style
+}
 
 
 % For drawing vertical chord brackets with \arpeggio
@@ -138,23 +235,23 @@ hideStaffSwitch = \set followVoice = ##f
 
 arpeggio = #(make-music 'ArpeggioEvent)
 
-arpeggioUp = \sequential {
-  \revert Arpeggio #'callbacks % stencil
-
+arpeggioArrowUp = \sequential {
+  \revert Arpeggio  #'stencil
   \override Arpeggio  #'arpeggio-direction = #UP
 }
-arpeggioDown = \sequential {
-  \revert Arpeggio #'callbacks % stencil
-
+arpeggioArrowDown = \sequential {
+  \revert Arpeggio #'stencil
   \override Arpeggio  #'arpeggio-direction = #DOWN
 }
-arpeggioNeutral = \sequential {
-  \revert Arpeggio #'callbacks % stencil
-
+arpeggioNormal = \sequential {
+  \revert Arpeggio #'stencil
   \revert Arpeggio  #'arpeggio-direction
 }
 arpeggioBracket = \sequential {
-  \override Arpeggio #'callbacks #'stencil = #Arpeggio::brew_chord_bracket
+  \override Arpeggio #'stencil = #ly:arpeggio::brew-chord-bracket
+}
+arpeggioParenthesis = \sequential {
+  \override Arpeggio #'stencil = #ly:arpeggio::brew-chord-slur
 }
 
 glissando = #(make-music 'GlissandoEvent)
@@ -203,14 +300,40 @@ italianChords = {
 improvisationOn =  {
     \set squashedPosition = #0
     \override NoteHead  #'style = #'slash
+    \override Accidental #'stencil = ##f
 }
 
 improvisationOff =  {
     \unset squashedPosition 
     \revert NoteHead #'style
+    \revert Accidental #'stencil
 }
 
 textSpannerUp = \override TextSpanner #'direction = #UP
 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
+}
+