patch::: 1.1.60.jcn1

[lilypond.git] / ly / property.ly

diff --git a/ly/property.ly b/ly/property.ly
index 7aa173d0b4de1fffcd0b37b313e11c2d65850b34..7ebb13411500769221bb6cbbea466b3d0aeb6d79 100644 (file)
--- a/ly/property.ly
+++ b/ly/property.ly
@@ -8,7 +8,7 @@ SEE THE REFERENCE MANUAL FOR EXPLANATIONS.
 
 %}
 
-\version "1.0.20";
+\version "1.1.52";
 
 %hmm, (these) abbrevs suck, imo
 % i guess they're meant as some form of doco
@@ -30,8 +30,8 @@ slurdown = \notes {
        \property Voice.slurVerticalDirection = \down
 }
 
-shifton =      \property Voice.hshift = 1
-shiftoff =     \property Voice.hshift = 0
+shifton = \property Voice.horizontalNoteShift = 1
+shiftoff = \property Voice.horizontalNoteShift = 0
 
 onevoice = {   
        \stemboth \shiftoff     
@@ -59,33 +59,6 @@ voicefour =
        \shifton
 }
 
-onestaff = 
-       \translator Staff=one
-
-
-staffone = {   
-       \translator Staff=one
-       \property Staff.verticalDirection = \center
-       \property Staff.hshift = 0
-}
-
-stafftwo = {   
-       \translator Staff=two
-       \property Staff.verticalDirection = \center
-       \property Staff.hshift = 0
-}
-
-staffthree = {         
-       \translator Staff=three
-       \property Staff.verticalDirection = \center
-       \property Staff.hshift = 0
-}
-
-stafffour = {  
-       \translator Staff=four
-       \property Staff.verticalDirection = \center
-       \property Staff.hshift = 0
-}
 
 % ugh, cluttering global namespace...
 
@@ -129,9 +102,6 @@ slurdotted =
        \property Voice.slurdash = 1
 
 
-%{
- for grace note hack, see input/test/grace.ly
-%}
 tupletoff = {
        \property Voice.tupletVisibility = 0
 }
@@ -140,7 +110,6 @@ tupleton = {
 }
 tiny  = {
        \property Voice.fontSize= "-2"
-       \tupletoff %urg
 }
 
 small  = {
@@ -149,38 +118,8 @@ small  = {
 
 normalsize = {
        \property Voice.fontSize= "0"
-       \tupleton %urg
 }
 
-%{
-  [urg: try at] temporary grace note hack
-  the total visible duration of the grace notes must be half
-  the duration of the 'at' note: e.g.:
-
-  \grace b8 \graceat c4 \ecarg
-  \grace c16 b16 \graceat c4 \ecarg
-
-grace = {
-       \tiny
-% it would be so cool not to have to specify these factors each time...
-% :-(
-       \property Voice.tupletVisibility = 0
-       \[1/16
-}
-
-graceat = \melodic {
-       \normalsize
-       \property Voice.tupletVisibility = 0
-       \] \[31/32
-}
-
-ecarg =  \melodic {
-       \property Voice.tupletVisibility = 0
-       \]
-       \property Voice.tupletVisibility = 3
-}
-%}
-
 normalkey = {
        \property Staff.keyoctaviation = 1
 }