release: 1.3.21

[lilypond.git] / scm / generic-property.scm

diff --git a/scm/generic-property.scm b/scm/generic-property.scm
index c6104e21d7c2e3c5f6cb1c399ebb0884934a47b4..fcf6fcbfb69669eb57bbcf1ddb069183c458a2ac 100644 (file)
--- a/scm/generic-property.scm
+++ b/scm/generic-property.scm
@@ -5,10 +5,9 @@
         (list 'beamSlopeDamping number? 'damping)
         (list 'autoKneeGap number? 'auto-knee-gap)
         (list 'autoInterstaffKneeGap number? 'auto-interstaff-knee-gap)
-        (list 'beamQuantisation symbol? 'slope-quantisation)
         (list 'beamDirAlgorithm symbol? 'beam-dir-algorithm)
-        (list 'beamSlope number? 'height)
-        (list 'beamVerticalPosition number? 'y-position)
+        (list 'beamHeight number? 'height-hs)
+        (list 'beamVerticalPosition number? 'y-position-hs)
         )
        )
   )
@@ -20,7 +19,8 @@
         (list 'stemVerticalDirection dir? 'direction)
         (list 'verticalDirection dir? 'direction)       
         (list 'stemLength number? 'length)
-        (list 'stemStyle string? 'style)
+        (list 'flagStyle string? 'flag-style)
+        (list 'stemCentered boolean? 'stem-centered)
         (list 'noStemExtend boolean? 'no-stem-extend)
         (list 'stemShorten number? 'shorten)
         ))
@@ -64,6 +64,15 @@
                     (list 'barSize number? 'bar-size))
        )
   )    
+
+(define generic-staff-symbol-properties
+  (cons "Staff_symbol" (list
+                       (list 'numberOfStaffLines number? 'line-count)
+                       (list 'staffSpace number? 'staff-space)
+                       )
+       )
+  )
+
 (define generic-breathing-sign-properties
   (cons "Breathing_sign"
        (list
@@ -98,6 +107,14 @@
         (list 'forceHorizontalShift number? 'force-hshift)
         )))
 
+(define generic-collision-properties
+  (cons "Collision"
+       (list
+        (list 'collisionMergeDotted boolean? 'merge-differently-dotted)
+        )
+       )
+  )
+  
 (define generic-slur-properties
   (cons "Slur"
        (list
@@ -131,6 +148,8 @@
    generic-bar-properties
    generic-timesig-properties
    generic-clef-properties
+   generic-collision-properties
+   generic-staff-symbol-properties
    generic-All-properties      
    )
   )
@@ -140,11 +159,9 @@
    generic-bar-properties
    ))
 
-
 (define generic-thread-properties
   (list generic-All-properties
        generic-dot-properties
-
        )
 
   )