X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fproperty-init.ly;h=f7fc11ae7358f6773049f39e729968c690b6ac2d;hb=87eedcd59f4082cb0841528ad5bc82cb1d1191e3;hp=ee2829ead9ef904d9d4ab733f8b326f50f196c1d;hpb=969911beb66f7a53f5a47aa7e00dbe3158e70c30;p=lilypond.git

diff --git a/ly/property-init.ly b/ly/property-init.ly
index ee2829ead9..f7fc11ae73 100644
--- a/ly/property-init.ly
+++ b/ly/property-init.ly
@@ -1,32 +1,32 @@
 % property-init.ly
 
-\version "2.4.0"
+\version "2.10.0"
 
-stemUp = \override Stem  #'direction = #1
-stemDown = \override Stem  #'direction = #-1 
+stemUp = \override Stem  #'direction = #UP
+stemDown = \override Stem  #'direction = #DOWN 
 stemNeutral= \revert Stem #'direction
 
-slurUp = \override Slur  #'direction = #1
-slurDown = \override Slur  #'direction = #-1
+slurUp = \override Slur  #'direction = #UP
+slurDown = \override Slur  #'direction = #DOWN
 slurNeutral = \revert Slur #'direction 
 
-% There's also dash, but setting dash period/length should be fixed.
+%% There's also dash, but setting dash period/length should be fixed.
 slurDashed = {
-	\override Slur #'dash-period = #0.75
-	\override Slur #'dash-fraction = #0.4
+  \override Slur #'dash-period = #0.75
+  \override Slur #'dash-fraction = #0.4
 }
 slurDotted = {
-	\override Slur  #'dash-period = #0.75
-	\override Slur #'dash-fraction = #0.1
+  \override Slur  #'dash-period = #0.75
+  \override Slur #'dash-fraction = #0.1
 }
 slurSolid = {
-	\revert Slur #'dash-period
-	\revert Slur #'dash-fraction
+  \revert Slur #'dash-period
+  \revert Slur #'dash-fraction
 }
 
 
-phrasingSlurUp = \override PhrasingSlur  #'direction = #1
-phrasingSlurDown = \override PhrasingSlur  #'direction = #-1
+phrasingSlurUp = \override PhrasingSlur  #'direction = #UP
+phrasingSlurDown = \override PhrasingSlur  #'direction = #DOWN
 phrasingSlurNeutral = \revert PhrasingSlur #'direction 
 
 shiftOn = \override NoteColumn  #'horizontal-shift = #1
@@ -34,32 +34,43 @@ shiftOnn = \override NoteColumn  #'horizontal-shift = #2
 shiftOnnn = \override NoteColumn  #'horizontal-shift = #3
 shiftOff = \revert NoteColumn #'horizontal-shift 
 
-tieUp = \override Tie  #'direction = #1
-tieDown = \override Tie  #'direction = #-1
+tieUp = \override Tie  #'direction = #UP
+tieDown = \override Tie  #'direction = #DOWN
 tieNeutral = \revert Tie #'direction 
 
-tieDotted = \override Tie  #'dashed = #1
-tieSolid = \revert Tie #'dashed
+tieDashed = {
+  \override Tie #'dash-period = #0.75
+  \override Tie #'dash-fraction = #0.4
+}
+tieDotted = {
+  \override Tie #'dash-period = #0.75
+  \override Tie #'dash-fraction = #0.1
+}
+tieSolid = {
+  \revert Tie #'dash-period
+  \revert Tie #'dash-fraction
+}
 
 setEasyHeads = \sequential {
-	\override NoteHead #'print-function = #Note_head::brew_ez_stencil
-	\override NoteHead #'Y-extent-callback = #'()
-	\override NoteHead #'X-extent-callback = #'()
+  \override NoteHead  #'stencil = #ly:note-head::brew-ez-stencil
+  \override NoteHead #'font-size = #-7
+  \override NoteHead #'font-family = #'sans
+  \override NoteHead #'font-series = #'bold
 }
 
 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 = #1
-  \override DynamicLineSpanner  #'direction = #1
+  \override DynamicText  #'direction = #UP
+  \override DynamicLineSpanner  #'direction = #UP
 }
 
 dynamicDown = {
-  \override DynamicText  #'direction = #-1
-  \override DynamicLineSpanner  #'direction = #-1
+  \override DynamicText  #'direction = #DOWN
+  \override DynamicLineSpanner  #'direction = #DOWN
 }
 
 dynamicNeutral = {
@@ -68,18 +79,18 @@ dynamicNeutral = {
 }
 
 
-dotsUp = \override Dots  #'direction = #1
-dotsDown = \override Dots  #'direction = #-1
+dotsUp = \override Dots  #'direction = #UP
+dotsDown = \override Dots  #'direction = #DOWN
 dotsNeutral = \revert Dots #'direction 
 
-tupletUp = \override TupletBracket  #'direction = #1
-tupletDown = \override TupletBracket  #'direction = #-1
+tupletUp = \override TupletBracket  #'direction = #UP
+tupletDown = \override TupletBracket  #'direction = #DOWN
 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?	
@@ -91,29 +102,32 @@ voiceFour = #(context-spec-music (make-voice-props-set 3) 'Voice)
 
 	
 tiny = 
-	\set fontSize = #-2
+\set fontSize = #-2
 
 small = 
-	\set fontSize = #-1
+\set fontSize = #-1
 
 normalsize = {
-	\set fontSize = #0
+  \set fontSize = #0
 }
 
 
-% End the incipit and print a ``normal line start''.
+%% End the incipit and print a ``normal line start''.
 endincipit =  \context Staff {
-    \partial 16 s16  % Hack to handle e.g. \bar ".|" \endincipit
-    \once \override Staff.Clef  #'full-size-change = ##t
-    \once \override Staff.Clef  #'non-default = ##t
-    \bar ""
+  \partial 16 s16  % Hack to handle e.g. \bar ".|" \endincipit
+  \once \override Staff.Clef  #'full-size-change = ##t
+  \once \override Staff.Clef  #'non-default = ##t
+  \bar ""
 }
 
 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
@@ -128,19 +142,19 @@ hideStaffSwitch = \set followVoice = ##f
 arpeggio = #(make-music 'ArpeggioEvent)
 
 arpeggioUp = \sequential {
-  \revert Arpeggio  #'print-function
-  \override Arpeggio  #'arpeggio-direction = #1
+  \revert Arpeggio  #'stencil
+  \override Arpeggio  #'arpeggio-direction = #UP
 }
 arpeggioDown = \sequential {
-  \revert Arpeggio  #'print-function
-  \override Arpeggio  #'arpeggio-direction = #-1
+  \revert Arpeggio #'stencil
+  \override Arpeggio  #'arpeggio-direction = #DOWN
 }
 arpeggioNeutral = \sequential {
-  \revert Arpeggio  #'print-function
+  \revert Arpeggio #'stencil
   \revert Arpeggio  #'arpeggio-direction
 }
 arpeggioBracket = \sequential {
-  \override Arpeggio  #'print-function = #Arpeggio::brew_chord_bracket
+  \override Arpeggio #'stencil = #ly:arpeggio::brew-chord-bracket
 }
 
 glissando = #(make-music 'GlissandoEvent)
@@ -195,3 +209,8 @@ improvisationOff =  {
     \unset squashedPosition 
     \revert NoteHead #'style
 }
+
+textSpannerUp = \override TextSpanner #'direction = #UP
+textSpannerDown = \override TextSpanner #'direction = #DOWN
+textSpannerNeutral = \revert TextSpanner #'direction
+