Merge with master

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

diff --git a/ly/property-init.ly b/ly/property-init.ly
index e8bdb855d91dff2ad243248bb9af8dc40d604731..f7fc11ae7358f6773049f39e729968c690b6ac2d 100644 (file)
--- a/ly/property-init.ly
+++ b/ly/property-init.ly
@@ -1,6 +1,6 @@
 % property-init.ly
 
-\version "2.7.14"
+\version "2.10.0"
 
 stemUp = \override Stem  #'direction = #UP
 stemDown = \override Stem  #'direction = #DOWN 
@@ -52,7 +52,7 @@ tieSolid = {
 }
 
 setEasyHeads = \sequential {
-  \override NoteHead  #'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?    
@@ -123,8 +123,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
@@ -151,7 +154,7 @@ arpeggioNeutral = \sequential {
   \revert Arpeggio  #'arpeggio-direction
 }
 arpeggioBracket = \sequential {
-  \override Arpeggio #'stencil = #Arpeggio::brew_chord_bracket
+  \override Arpeggio #'stencil = #ly:arpeggio::brew-chord-bracket
 }
 
 glissando = #(make-music 'GlissandoEvent)