release: 1.1.43

[lilypond.git] / ly / property.ly

diff --git a/ly/property.ly b/ly/property.ly
index 0ee196761bc6a739777b2137e7bbb809e2bfe2b1..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
-beamAutoEnd8           "num/den"    end auto-beam of 8ths
-beamAutoEnd16          "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
@@ -73,6 +73,12 @@ timeSignatureStyle   oldn/m  Set symbol explicitly,
                                n/m=2/2,3/2,3/4,4/4,6/4 or 9/4.
 [Staff]
 voltaVisibility         0/1     on/off
+voltaSpannerDuration    Rat.    Coda kludge: set length of volta-spanner,
+                                typically set to one measure: "1"
+
+[Staff]
+clefStyle       "fullSizeChanges" Clef changes typeset in full size
+clefStyle       "transparent"     No clef typeset
 
 [Staff?]
 instrument             ascii   midi instrument table lookup
@@ -97,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
 
@@ -122,31 +127,31 @@ 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
 }
 
-onestaff = {   
+onestaff = 
        \translator Staff=one
-}
+
 
 staffone = {   
        \translator Staff=one
@@ -173,45 +178,46 @@ stafffour = {
 }
 
 % ugh, cluttering global namespace...
+
+% ugh2. 
 none=0
 free=0
 normal=1
 traditional=2
 infinity=10000
 
-beamslopeproportional = {
+beamslopeproportional = 
        \property Score.beamslopedamping = \none
-}
 
-beamslopedamped = {
+beamslopedamped = 
        \property Score.beamslopedamping = \normal
-}
 
-beamslopezero = {
+
+beamslopezero = 
        \property Score.beamslopedamping = \infinity
-}
+
 
 % this sucks, you'd want to pass an array, at least
 % (or embedded code: you still can't dictate the slope / stemlength)
-beamposfree = {
+beamposfree = 
        \property Score.beamquantisation = \none
-}
 
-beamposnormal = {
+
+beamposnormal = 
        \property Score.beamquantisation = \normal
-}
 
-beampostraditional = {
+
+beampostraditional = 
        \property Score.beamquantisation = \traditional
-}
 
-slurnormal = {
-       \property Voice.slurdash = 0
-}
 
-slurdotted = {
+slurnormal = 
+       \property Voice.slurdash = ""
+
+
+slurdotted = 
        \property Voice.slurdash = 1
-}
+
 
 %{
  for grace note hack, see input/test/grace.ly
@@ -273,3 +279,9 @@ specialkey = {
        \property Staff.keyoctaviation = 0
 }
 
+% 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" 
+    \nobreak \bar "";
+}