X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fproperty.ly;h=ddc99ba5078de2f4a7791bf45686df8fa330fd62;hb=3a0e9efb7f067e5b334ba0596b95e15d96d7cc49;hp=ea41ac9656b675a4665b2016e1986073985daca6;hpb=8002fa018c81f70585c25232247c6dcba7f5cba0;p=lilypond.git

diff --git a/ly/property.ly b/ly/property.ly
index ea41ac9656..ddc99ba507 100644
--- a/ly/property.ly
+++ b/ly/property.ly
@@ -8,7 +8,7 @@ SEE THE REFERENCE MANUAL FOR EXPLANATIONS.
 
 %}
 
-\version "1.2.0";
+\version "1.2.16";
 
 %hmm, (these) abbrevs suck, imo
 % i guess they're meant as some form of doco
@@ -17,52 +17,28 @@ stemup =        \property Voice.verticalDirection = \up
 stemboth= 	\property Voice.verticalDirection = \center
 stemdown = 	\property Voice.verticalDirection = \down
 
-slurup = \notes {
-	s1*0
-	\property Voice.slurVerticalDirection = \up 
-	}
-slurboth= \notes {
-	s1*0
-	\property Voice.slurVerticalDirection = \center
-}
-slurdown = \notes { 	
-	s1*0
-	\property Voice.slurVerticalDirection = \down
-}
-
-shifton = \property Voice.horizontalNoteShift = 1
-shiftoff = \property Voice.horizontalNoteShift = 0
+slurup   = \property Voice.slurVerticalDirection = \up 
+slurboth = \property Voice.slurVerticalDirection = \center
+slurdown = \property Voice.slurVerticalDirection = \down
+shifton  = \property Voice.horizontalNoteShift = #1
+shiftoff = \property Voice.horizontalNoteShift = #0
 
 onevoice = { 	
 	\stemboth \shiftoff	
 }
 
-%{ THESE ARE DEPRECATED  %}
-voiceone = 
-	\context Voice = one  {
+voiceone = \stemup
+voicetwo = \stemdown
+voicethree = {
 	\stemup
+	\shifton
 }
 
-voicetwo = 
-	\context Voice = two {
-	\stemdown
-}
-
-voicethree = 
-	\context Voice = three {
-	\stemup
-
-}
-
-voicefour = 
-	\context Voice = four {
+voicefour = {
 	\stemdown
 	\shifton
 }
 
-%{ END OF DEPRECATED %}
-
-
 % ugh, cluttering global namespace...
 
 % ugh2. 
@@ -97,26 +73,26 @@ slurnormal =
 	\property Voice.slurDash = ""
 
 
-slurdotted = 
+slurdotted =				
 	\property Voice.slurDash = 1
 
 
-tupletoff = {
+tupletoff =
 	\property Voice.tupletVisibility = 0
-}
-tupleton = {
+
+tupleton = 
 	\property Voice.tupletVisibility = 3
-}
-tiny  = {
-	\property Voice.fontSize= "-2"
-}
 
-small  = {
-	\property Voice.fontSize= "-1"
-}
+tiny  = 
+	\property Voice.fontSize= -2
+
+
+small  = 
+	\property Voice.fontSize= -1
+
 
 normalsize = {
-	\property Voice.fontSize= "0"
+	\property Voice.fontSize= 0
 }
 
 normalkey = {
@@ -130,13 +106,13 @@ specialkey = {
 % End the incipit and print a ``normal line start''.
 endincipit = \notes{
     \partial 16; s16  % Hack to handle e.g. \bar ".|"; \endincipit
-    \property Staff.clefStyle = "fullSizeChanges" 
+    \property Staff.clefStyle = #"fullSizeChanges" 
     \nobreak \bar "";
 }
 
-autoBeamOff = \property Voice.noAutoBeaming = "1"
-autoBeamOn = \property Voice.noAutoBeaming = ""
+autoBeamOff = \property Voice.noAutoBeaming = #t
+autoBeamOn = \property Voice.noAutoBeaming = ##f
 
 
-emptyText = \property Voice.textEmptyDimension = "1"
-fatText = \property Voice.textEmptyDimension = ""
+emptyText = \property Voice.textEmptyDimension = ##t
+fatText = \property Voice.textEmptyDimension = ##f