X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fproperty-init.ly;h=2d50a6c6019569271214b6c1ca09e0acada8552d;hb=52f8d56f1353504194bebf63b5d5e645fa46b583;hp=26108fb73b94ac43e1efb4344cb0efa5ab75ec92;hpb=b752f4012d751e7e01be9092df73047470d51d6c;p=lilypond.git

diff --git a/ly/property-init.ly b/ly/property-init.ly
index 26108fb73b..2d50a6c601 100644
--- a/ly/property-init.ly
+++ b/ly/property-init.ly
@@ -1,6 +1,6 @@
 % property-init.ly
 
-\version "2.11.52"
+\version "2.12.0"
 
 stemUp = \override Stem #'direction = #UP
 stemDown = \override Stem #'direction = #DOWN 
@@ -10,7 +10,6 @@ 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.
 slurDashed = {
   \override Slur #'dash-period = #0.75
   \override Slur #'dash-fraction = #0.4
@@ -29,6 +28,19 @@ phrasingSlurUp = \override PhrasingSlur #'direction = #UP
 phrasingSlurDown = \override PhrasingSlur #'direction = #DOWN
 phrasingSlurNeutral = \revert PhrasingSlur #'direction
 
+phrasingSlurDashed = {
+  \override PhrasingSlur #'dash-period = #0.75
+  \override PhrasingSlur #'dash-fraction = #0.4
+}
+phrasingSlurDotted = {
+  \override PhrasingSlur #'dash-period = #0.75
+  \override PhrasingSlur #'dash-fraction = #0.1
+}
+phrasingSlurSolid = {
+  \revert PhrasingSlur #'dash-period
+  \revert PhrasingSlur #'dash-fraction
+}
+
 mergeDifferentlyDottedOn = {
   \override Staff.NoteCollision #'merge-differently-dotted = ##t
 }
@@ -79,9 +91,9 @@ easyHeadsOff = {
   \revert NoteHead #'font-series
 }
 
-aikenHeads = \set shapeNoteStyles = ##(do re mi fa #f la ti)
+aikenHeads = \set shapeNoteStyles = #'#(do re mi fa #f la ti)
 
-sacredHarpHeads = \set shapeNoteStyles = ##(fa #f la fa #f la mi)
+sacredHarpHeads = \set shapeNoteStyles = #'#(fa #f la fa #f la mi)
 
 dynamicUp = {
   \override DynamicText #'direction = #UP
@@ -188,22 +200,22 @@ autoBeamOn = \set autoBeaming = ##t
 
 textLengthOn = {
   \override TextScript #'extra-spacing-width = #'(0 . 0)
-  \override TextScript #'infinite-spacing-height = ##t
+  \override TextScript #'extra-spacing-height = #'(-inf.0 . +inf.0)
 }
 
 textLengthOff = {
   \override TextScript #'extra-spacing-width = #'(+inf.0 . -inf.0)
-  \override TextScript #'infinite-spacing-height = ##f
+  \override TextScript #'extra-spacing-height = #'(0 . 0)
 }
 
 balloonLengthOn = {
   \override BalloonTextItem #'extra-spacing-width = #'(0 . 0)
-  \override BalloonTextItem #'infinite-spacing-height = ##t
+  \override BalloonTextItem #'extra-spacing-height = #'(-inf.0 . +inf.0)
 }
 
 balloonLengthOff = {
   \override BalloonTextItem #'extra-spacing-width = #'(+inf.0 . -inf.0)
-  \override BalloonTextItem #'infinite-spacing-height = ##f
+  \override BalloonTextItem #'extra-spacing-height = #'(0 . 0)
 }
 
 
@@ -341,3 +353,18 @@ bassFigureStaffAlignmentNeutral = {
   \revert Staff.BassFigureAlignmentPositioning #'direction
 }
 
+predefinedFretboardsOff = {  
+  \set FretBoards.predefinedDiagramTable = ##f
+}
+
+predefinedFretboardsOn = {
+  \set FretBoards.predefinedDiagramTable = #fretboard-table
+}
+
+pointAndClickOff = #(define-music-function (parser location) ()
+                      (ly:set-option 'point-and-click #f)
+                      (make-music 'SequentialMusic 'void #t))
+
+pointAndClickOn = #(define-music-function (parser location) ()
+                      (ly:set-option 'point-and-click #t)
+                      (make-music 'SequentialMusic 'void #t))