release: 1.3.21

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

diff --git a/scm/generic-property.scm b/scm/generic-property.scm
index 88b6b6a3e19cae5729d7b18e240f0d436fd17e01..fcf6fcbfb69669eb57bbcf1ddb069183c458a2ac 100644 (file)
--- a/scm/generic-property.scm
+++ b/scm/generic-property.scm
@@ -2,11 +2,12 @@
 (define generic-beam-properties
   (cons "Beam"
        (list
-        (list 'beamslopedamping number? 'damping)
+        (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 'beamHeight number? 'height-hs)
+        (list 'beamVerticalPosition number? 'y-position-hs)
         )
        )
   )
@@ -18,35 +19,70 @@
         (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)
         ))
   )
 
+(define generic-dot-properties
+  (cons "Dots" (list
+               (list 'dotDirection dir? 'direction)
+               (list 'verticalDirection dir? 'direction)
+               )
+       ))
+
+(define generic-script-properties
+  (cons "Script" (list
+                 (list 'articulationScriptVerticalDirection dir? 'direction)
+                 (list 'articulationScriptPadding number? 'padding)
+
+                 ))
+  )
+
+
+
 (define generic-text-properties
   (cons "Text_item" (list
                     (list 'textStyle string? 'style)
                     (list 'textScriptPadding number? 'padding)
+                    (list 'textVerticalAlignment dir? 'self-alignment-Y)
+                    (list 'textHorizontalAlignment dir? 'self-alignment-X)
                     )
        ))
 
+(define generic-crescendo-properties
+  (cons "Crescendo" (list
+                    (list 'dynamicDirection dir? 'direction)
+                    (list 'verticalDirection dir? 'direction)
+                    (list 'dynamicPadding number? 'padding) 
+                    )))
+  
 (define generic-bar-properties
   (cons "Staff_bar" (list
                     (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
         (list 'breathingSignVerticalDirection dir? 'direction)
         (list 'verticalDirection dir? 'direction)
-        (list 'breathingSignBreakPriority number? 'break-priority
-         ))))
+        )))
 
 (define generic-clef-properties
   (cons "Clef_item"
        (list
-        (list 'clefBreakPriority number? 'break-priority)
         (list 'clefStyle string? 'style))
        )
   )
@@ -71,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
@@ -81,29 +125,44 @@
 (define generic-timesig-properties
   (cons "Time_signature"
        (list
-        (list 'timeSignatureStyle string? 'sigstyle))))
+        (list 'timeSignatureStyle string? 'style))))
 
 (define generic-voice-properties
   (list
    generic-stem-properties
+   generic-breathing-sign-properties
+   generic-tie-properties
    generic-rest-properties
    generic-slur-properties
    generic-beam-properties
    generic-text-properties
    generic-note-column-properties
+   generic-crescendo-properties
    generic-All-properties
    ))
 
 (define generic-grace-properties generic-voice-properties)
 (define generic-staff-properties
   (list
+   generic-text-properties   
    generic-bar-properties
    generic-timesig-properties
    generic-clef-properties
+   generic-collision-properties
+   generic-staff-symbol-properties
    generic-All-properties      
    )
   )
+(define generic-grand-staff-properties
+  (list
+   generic-text-properties   
+   generic-bar-properties
+   ))
 
 (define generic-thread-properties
-  (list generic-All-properties))
+  (list generic-All-properties
+       generic-dot-properties
+       )
+
+  )