X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fproperty-init.ly;h=71076e5f7baa231833a1de52311f8a13b9c4fcce;hb=36f6cd546770e38c6e2314404e21f1c89504eb7d;hp=b6b68f7877f87f40b41c549a068dc3f9ed8ac326;hpb=a56e7512be4d7cf266c9e6eca8e86e631701dae3;p=lilypond.git

diff --git a/ly/property-init.ly b/ly/property-init.ly
index b6b68f7877..71076e5f7b 100644
--- a/ly/property-init.ly
+++ b/ly/property-init.ly
@@ -1,23 +1,33 @@
 % property-init.ly
 
-\version "2.3.8"
+\version "2.6.0"
 
 stemUp = \override Stem  #'direction = #1
 stemDown = \override Stem  #'direction = #-1 
-stemBoth= \revert Stem #'direction
+stemNeutral= \revert Stem #'direction
 
 slurUp = \override Slur  #'direction = #1
 slurDown = \override Slur  #'direction = #-1
-slurBoth = \revert Slur #'direction 
+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 
+phrasingSlurNeutral = \revert PhrasingSlur #'direction 
 
 shiftOn = \override NoteColumn  #'horizontal-shift = #1
 shiftOnn = \override NoteColumn  #'horizontal-shift = #2
@@ -26,26 +36,44 @@ shiftOff = \revert NoteColumn #'horizontal-shift
 
 tieUp = \override Tie  #'direction = #1
 tieDown = \override Tie  #'direction = #-1
-tieBoth = \revert Tie #'direction 
+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 #'print-function = #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)
+
 dynamicUp = {
   \override DynamicText  #'direction = #1
   \override DynamicLineSpanner  #'direction = #1
 }
+
 dynamicDown = {
   \override DynamicText  #'direction = #-1
   \override DynamicLineSpanner  #'direction = #-1
 }
-dynamicBoth = {
+
+dynamicNeutral = {
   \revert DynamicText #'direction
   \revert DynamicLineSpanner #'direction
 }
@@ -53,11 +81,11 @@ dynamicBoth = {
 
 dotsUp = \override Dots  #'direction = #1
 dotsDown = \override Dots  #'direction = #-1
-dotsBoth = \revert Dots #'direction 
+dotsNeutral = \revert Dots #'direction 
 
 tupletUp = \override TupletBracket  #'direction = #1
 tupletDown = \override TupletBracket  #'direction = #-1
-tupletBoth = \revert TupletBracket #'direction
+tupletNeutral = \revert TupletBracket #'direction
 
 cadenzaOn = \set Timing.timing = ##f
 cadenzaOff = {
@@ -74,22 +102,22 @@ 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
@@ -103,13 +131,6 @@ 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 
@@ -125,25 +146,26 @@ arpeggioDown = \sequential {
   \revert Arpeggio  #'print-function
   \override Arpeggio  #'arpeggio-direction = #-1
 }
-arpeggioBoth = \sequential {
+arpeggioNeutral = \sequential {
   \revert Arpeggio  #'print-function
   \revert Arpeggio  #'arpeggio-direction
 }
 arpeggioBracket = \sequential {
-  \override Arpeggio  #'print-function = #Arpeggio::brew_chord_bracket
+  \override Arpeggio #'print-function = #Arpeggio::brew_chord_bracket
 }
 
 glissando = #(make-music 'GlissandoEvent)
 
-fermataMarkup = \markup { \musicglyph #"scripts-ufermata" } 
+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 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
 }
 
 
@@ -152,6 +174,7 @@ unHideNotes = \sequential {
   \revert Beam #'transparent
   \revert Stem #'transparent
   \revert NoteHead #'transparent
+  \revert NoteHead #'no-ledgers
   \revert Dots #'transparent 
 }
 
@@ -164,7 +187,15 @@ semiGermanChords = {
     \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
@@ -175,3 +206,8 @@ improvisationOff =  {
     \unset squashedPosition 
     \revert NoteHead #'style
 }
+
+textSpannerUp = \override TextSpanner #'direction = #1
+textSpannerDown = \override TextSpanner #'direction = #-1
+textSpannerNeutral = \revert TextSpanner #'direction
+