X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fproperty-init.ly;h=8ca7f8c284678bf57d6c6cb77a68374133ab54dd;hb=dbecaef83849f8747d286f4f601ff61b692b0be5;hp=43008965076ad25d97a14057e2c277397af4b2c5;hpb=c2389d605aaaf3b3e8c416428d4b4088e4b049ca;p=lilypond.git

diff --git a/ly/property-init.ly b/ly/property-init.ly
index 4300896507..8ca7f8c284 100644
--- a/ly/property-init.ly
+++ b/ly/property-init.ly
@@ -1,6 +1,6 @@
 % property-init.ly
 
-\version "2.7.13"
+\version "2.10.0"
 
 stemUp = \override Stem  #'direction = #UP
 stemDown = \override Stem  #'direction = #DOWN 
@@ -52,7 +52,7 @@ tieSolid = {
 }
 
 setEasyHeads = \sequential {
-  \override NoteHead #'callbacks #'stencil = #Note_head::brew_ez_stencil
+  \override NoteHead  #'stencil = #ly:note-head::brew-ez-stencil
   \override NoteHead #'font-size = #-7
   \override NoteHead #'font-family = #'sans
   \override NoteHead #'font-series = #'bold
@@ -61,7 +61,7 @@ setEasyHeads = \sequential {
 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 +90,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,6 +100,37 @@ 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)
 
+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
+}
+
 	
 tiny = 
 \set fontSize = #-2
@@ -123,8 +154,11 @@ 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
+fatText = { \override TextScript  #'extra-spacing-width = #'(0 . 0)
+            \override TextScript  #'infinite-spacing-height = ##t }
+
+emptyText = { \override TextScript  #'extra-spacing-width = #'(+inf.0 . -inf.0)
+              \override TextScript  #'infinite-spacing-height = ##f }
 
 showStaffSwitch = \set followVoice = ##t
 hideStaffSwitch = \set followVoice = ##f
@@ -139,22 +173,19 @@ hideStaffSwitch = \set followVoice = ##f
 arpeggio = #(make-music 'ArpeggioEvent)
 
 arpeggioUp = \sequential {
-  \revert Arpeggio #'callbacks % stencil
-
+  \revert Arpeggio  #'stencil
   \override Arpeggio  #'arpeggio-direction = #UP
 }
 arpeggioDown = \sequential {
-  \revert Arpeggio #'callbacks % stencil
-
+  \revert Arpeggio #'stencil
   \override Arpeggio  #'arpeggio-direction = #DOWN
 }
 arpeggioNeutral = \sequential {
-  \revert Arpeggio #'callbacks % stencil
-
+  \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
 }
 
 glissando = #(make-music 'GlissandoEvent)
@@ -203,14 +234,17 @@ 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
 
+