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

diff --git a/ly/property-init.ly b/ly/property-init.ly
index 0c554b4b9f..8ca7f8c284 100644
--- a/ly/property-init.ly
+++ b/ly/property-init.ly
@@ -1,89 +1,96 @@
 % property-init.ly
 
-\version "2.1.36"
+\version "2.10.0"
 
-stemUp = \override Stem  #'direction = #1
-stemDown = \override Stem  #'direction = #-1 
-stemBoth= \revert Stem #'direction
+stemUp = \override Stem  #'direction = #UP
+stemDown = \override Stem  #'direction = #DOWN 
+stemNeutral= \revert Stem #'direction
 
-slurUp = \override Slur  #'direction = #1
-slurDown = \override Slur  #'direction = #-1
-slurBoth = \revert Slur #'direction 
+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.
-slurDotted = \override Slur  #'dashed = #1
-slurSolid = \revert Slur #'dashed
+%% 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
+}
+slurDotted = {
+  \override Slur  #'dash-period = #0.75
+  \override Slur #'dash-fraction = #0.1
+}
+slurSolid = {
+  \revert Slur #'dash-period
+  \revert Slur #'dash-fraction
+}
 
 
-phrasingSlurUp = \override PhrasingSlur  #'direction = #1
-phrasingSlurDown = \override PhrasingSlur  #'direction = #-1
-phrasingSlurBoth = \revert PhrasingSlur #'direction 
+phrasingSlurUp = \override PhrasingSlur  #'direction = #UP
+phrasingSlurDown = \override PhrasingSlur  #'direction = #DOWN
+phrasingSlurNeutral = \revert PhrasingSlur #'direction 
 
 shiftOn = \override NoteColumn  #'horizontal-shift = #1
 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
-tieBoth = \revert Tie #'direction 
+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 = ##(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
 }
-dynamicBoth = {
+
+dynamicNeutral = {
   \revert DynamicText #'direction
   \revert DynamicLineSpanner #'direction
 }
 
-scriptUp = {
-  \override TextScript  #'direction = #1
-  \override Script  #'direction = #1
-}
-scriptDown = {
-  \override TextScript  #'direction = #-1
-  \override Script  #'direction = #-1
-}
-scriptBoth = {
-  \revert TextScript #'direction
-  \revert Script #'direction
-}
 
-dotsUp = \override Dots  #'direction = #1
-dotsDown = \override Dots  #'direction = #-1
-dotsBoth = \revert Dots #'direction 
+dotsUp = \override Dots  #'direction = #UP
+dotsDown = \override Dots  #'direction = #DOWN
+dotsNeutral = \revert Dots #'direction 
 
-tupletUp = \override TupletBracket  #'direction = #1
-tupletDown = \override TupletBracket  #'direction = #-1
-tupletBoth = \revert TupletBracket #'direction
+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)
-}
-
-newpage = \notes
-{
-  \break
-  %% FIXME: page break penalty should tickle into Paper_line
-  %% \context Score \applyoutput
-  %%#(outputproperty-compatibility (make-type-checker 'paper-column-interface)
-  %%  'between-system-string "\\newpage")
+  \set Timing.measurePosition = #ZERO-MOMENT
 }
 
 % dynamic ly:dir?  text script, articulation script ly:dir?	
@@ -93,44 +100,71 @@ 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
+\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''.
-endincipit = \notes \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 ""
+%% 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 ""
 }
 
 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
 
 
 
-% To remove a Volta bracket or some other graphical object,
-% set it to turnOff. Example: \set Staff.VoltaBracket = \turnOff
-
-%%
-%% DO NOT USE THIS. IT CAN LEAD TO CRASHES.
-turnOff = #(cons '() '())
-
 % For drawing vertical chord brackets with \arpeggio
 % This is a shorthand for the value of the print-function property 
 % of either Staff.Arpeggio or PianoStaff.Arpeggio, depending whether 
@@ -139,45 +173,42 @@ turnOff = #(cons '() '())
 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
 }
-arpeggioBoth = \sequential {
-  \revert Arpeggio  #'print-function
+arpeggioNeutral = \sequential {
+  \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)
 
-fermataMarkup = \markup { \musicglyph #"scripts-ufermata" } 
-
-setMmRestFermata =
-  \once \override MultiMeasureRestNumber  #'text =
-    #fermataMarkup 
-
+fermataMarkup = \markup { \musicglyph #"scripts.ufermata" } 
 
 hideNotes =\sequential {
-				% hide notes, accidentals, etc.
-    \override Dots  #'transparent = ##t
-    \override NoteHead  #'transparent = ##t
-    \override Stem  #'transparent = ##t
-    \override Beam  #'transparent = ##t
-    \override Staff.Accidental  #'transparent = ##t
+  % hide notes, accidentals, etc.
+  \override Dots  #'transparent = ##t
+  \override NoteHead  #'transparent = ##t
+  \override NoteHead  #'no-ledgers = ##t
+  \override Stem  #'transparent = ##t
+  \override Beam  #'transparent = ##t
+  \override Accidental  #'transparent = ##t
 }
 
 
 unHideNotes = \sequential {
-  \revert Staff.Accidental #'transparent
+  \revert Accidental #'transparent
   \revert Beam #'transparent
   \revert Stem #'transparent
   \revert NoteHead #'transparent
+  \revert NoteHead #'no-ledgers
   \revert Dots #'transparent 
 }
 
@@ -189,3 +220,31 @@ semiGermanChords = {
     \set chordRootNamer = #(chord-name->german-markup #f)
     \set chordNoteNamer = #note-name->german-markup
 }
+
+frenchChords = {
+    \set chordRootNamer = #(chord-name->italian-markup #t)
+    \set chordPrefixSpacer = #0.4
+}
+
+italianChords = {
+    \set chordRootNamer = #(chord-name->italian-markup #f)
+    \set chordPrefixSpacer = #0.4
+}
+
+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
+
+