X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fproperty.ly;h=028933e231aa677b805ad6981cef9146ee1c6d1c;hb=108e1d80114deeb5afdcd306e1dcdeced4ca262d;hp=3c255916de52bab875babfb4dff7bdeadf54bc32;hpb=f988425624a6f6d1a48aea0ac0c1c84ff0857e56;p=lilypond.git

diff --git a/ly/property.ly b/ly/property.ly
index 3c255916de..028933e231 100644
--- a/ly/property.ly
+++ b/ly/property.ly
@@ -1,23 +1,23 @@
 % property.ly
 
-\version "1.3.59";
+\version "1.3.110";
 
-stemup = \property Voice.basicStemProperties \push #'direction = #1
-stemdown = \property Voice.basicStemProperties \push #'direction = #-1 
-stemboth= \property basicStemProperties \pop #'direction
+stemUp = \property Voice.Stem \override #'direction = #1
+stemDown = \property Voice.Stem \override #'direction = #-1 
+stemBoth= \property Voice.Stem \revert #'direction
 
-slurup   = \property Voice.basicSlurProperties \push #'direction = #1
-slurboth = \property basicSlurProperties \pop #'direction 
-slurdown = \property Voice.basicSlurProperties \push #'direction = #-1
-shifton  = \property Voice.basicNoteColumnProperties \push #'horizontal-shift = #1
-shiftonn  = \property Voice.basicNoteColumnProperties \push #'horizontal-shift = #2
-shiftonnn  = \property Voice.basicNoteColumnProperties \push #'horizontal-shift = #3
-shiftoff  = \property basicNoteColumnProperties \pop #'horizontal-shift 
+slurUp   = \property Voice.Slur \override #'direction = #1
+slurBoth = \property Voice.Slur \revert #'direction 
+slurDown = \property Voice.Slur \override #'direction = #-1
+shiftOn  = \property Voice.NoteColumn \override #'horizontal-shift = #1
+shiftOnn  = \property Voice.NoteColumn \override #'horizontal-shift = #2
+shiftOnnn  = \property Voice.NoteColumn \override #'horizontal-shift = #3
+shiftOff  = \property Voice.NoteColumn \revert #'horizontal-shift 
 
 
-tieUp = \property Voice.basicTieProperties \push #'direction = #1
-tieDown = \property Voice.basicTieProperties \push #'direction = #-1
-tieBoth = \property basicTieProperties \pop #'direction 
+tieUp = \property Voice.Tie \override #'direction = #1
+tieDown = \property Voice.Tie \override #'direction = #-1
+tieBoth = \property Voice.Tie \revert #'direction 
 
 cadenzaOn = \property Score.timing = ##f
 cadenzaOff = { \property Score.timing = ##t
@@ -25,48 +25,31 @@ cadenzaOff = { \property Score.timing = ##t
 	}
 
 	
-onevoice = { 	
-	\stemboth
+oneVoice = { 	
+	\stemBoth
 	\tieBoth
+	\shiftOff
 }
 
-voiceone = { \stemup
+voiceOne = { \stemUp
    \tieUp
 }
-voicetwo = { \stemdown
+voiceTwo = { \stemDown
    \tieDown
    }
    
-voicethree = {
-	\stemup
-	\shifton
+voiceThree = {
+	\stemUp
+	\shiftOn
 }
 
-voicefour = {
-	\stemdown
-	\shifton
+voiceFour = {
+	\stemDown
+	\shiftOn
 }
 
-% ugh, cluttering global namespace...
-
-% ugh2. 
-infinity=10000
-%{
-
-slurnormal = 
-	\property Voice.slurDash = ##f
-
-
-slurdotted =				
-	\property Voice.slurDash = 1
-
-
-tupletoff =
-	\property Voice.tupletVisibility = 0
-
-tupleton = 
-	\property Voice.tupletVisibility = 3
-%}
+slurDotted = \property Voice.Slur \override #'dashed = #1
+slurNoDots = \property Voice.Slur \revert #'dashed
 
 	
 tiny  = 
@@ -99,7 +82,14 @@ endincipit = \notes{
 autoBeamOff = \property Voice.noAutoBeaming = ##t
 autoBeamOn = \property Voice.noAutoBeaming = ##f
 
-
 emptyText = \property Voice.textNonEmpty = ##f
 fatText = \property Voice.textNonEmpty = ##t
 
+showStaffSwitch = \property Thread.followThread = ##t
+hideStaffSwitch = \property Thread.followThread = ##f
+
+
+% To remove a Volta bracet or some other graphical object,
+% set it to turnOff. Example: \property Staff.VoltaBracket = \turnOff
+
+turnOff = #'((meta .  ((interfaces . ()))))