release: 1.1.43

[lilypond.git] / ly / property.ly

diff --git a/ly/property.ly b/ly/property.ly
index 2c7bcbae1dcbf908e986dfa781d6559779708d19..354d0f5664d48856c5cde856b983cdf5a2f51b12 100644 (file)
--- a/ly/property.ly
+++ b/ly/property.ly
@@ -35,6 +35,11 @@ textalignment                -1      left alignment of text
 textalignment          0       center alignment of text
 textalignment          1       right alignment of text
 
+beamAuto                0/1     auto-beam on/off
+beamAutoEnd            "num/den"    end auto-beam
+beamAutoEnd_8          "num/den"    end auto-beam of 8ths
+beamAutoEnd_16         "num/den"    end auto-beam of 16ths
+
 [Score?]
 beamslopedamping       0       no damping              \beamslopeproportional  
 beamslopedamping       1       damping1)               \beamslopedamped
@@ -59,11 +64,6 @@ barAuto                      1       auto-generate bar every measure
 barAtLineStart         0/1     generate bar at beginning of line
 
 [Staff]
-beamAuto                0/1     auto-beam on/off
-beamAutoEnd            "num/den"    end auto-beam
-beamAutoEnd_8          "num/den"    end auto-beam of 8ths
-beamAutoEnd_16         "num/den"    end auto-beam of 16ths
-
 timeSignatureStyle     C       Use C and stroked C for 4/4,2/2
 timeSignatureStyle     old     Use old style mensuration marks
 timeSignatureStyle     1       Use single number
@@ -103,8 +103,7 @@ chordInversion              0/1     Find and display chord with inversion?
 %hmm, (these) abbrevs suck, imo
 % i guess they're meant as some form of doco
 % that's what i use them for...
-stemup = 
-       \property Voice.ydirection = \up 
+stemup =        \property Voice.ydirection = \up 
 stemboth=      \property Voice.ydirection = \center
 stemdown =     \property Voice.ydirection = \down
 
@@ -128,24 +127,24 @@ onevoice = {
        \stemboth \shiftoff     
 }
 
-voiceone = {   
-       \type Voice = one 
+voiceone = 
+       \context Voice = one  {
        \stemup
 }
 
-voicetwo = {   
-       \type Voice = two
+voicetwo = 
+       \context Voice = two {
        \stemdown
 }
 
-voicethree = {         
-       \type Voice = three
+voicethree = 
+       \context Voice = three {
        \stemup
 
 }
 
-voicefour = {  
-       \type Voice = four
+voicefour = 
+       \context Voice = four {
        \stemdown
        \shifton
 }
@@ -179,6 +178,8 @@ stafffour = {
 }
 
 % ugh, cluttering global namespace...
+
+% ugh2. 
 none=0
 free=0
 normal=1