patch::: 1.3.42.jcn2

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

diff --git a/scm/generic-property.scm b/scm/generic-property.scm
index 498f05bc4aee589fbd45117ce297d8ad49e9352e..554408caffd6325f867686baa9272a921c5e1d73 100644 (file)
--- a/scm/generic-property.scm
+++ b/scm/generic-property.scm
@@ -1,4 +1,19 @@
 
+;
+; Format: 
+; (cons "Type name"
+;    (list PROPERTYDESCRIPTIONS))
+; 
+; where
+; PROPERTYDESCRIPTION
+; is
+;
+;  (list 'translatorPropertySymbol type-predicate backend-property-symbol)
+;
+; Descriptions earlier in the list take precedence over later descriptions.
+;
+
+
 (define generic-beam-properties
   (cons "Beam"
        (list
@@ -6,8 +21,8 @@
         (list 'autoKneeGap number? 'auto-knee-gap)
         (list 'autoInterstaffKneeGap number? 'auto-interstaff-knee-gap)
         (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)
         )
        )
   )
@@ -54,23 +69,36 @@
 
 (define generic-crescendo-properties
   (cons "Crescendo" (list
+                    (list 'verticalDirection dir? 'direction)
                     (list 'dynamicDirection dir? 'direction)
+                    (list 'dynamicPadding number? 'padding) 
+                    (list 'dynamicMinimumSpace number? 'minimum-space) 
+                    )))
+  
+(define generic-dynamic-line-spanner-properties
+  (cons "Dynamic_line_spanner" (list
                     (list 'verticalDirection dir? 'direction)
+                    (list 'dynamicDirection dir? 'direction)
                     (list 'dynamicPadding number? 'padding) 
+                    (list 'dynamicMinimumSpace number? 'minimum-space) 
+                    )))
+  
+(define generic-volta-spanner-properties
+  (cons "Volta_spanner" (list
+                    (list 'voltaVerticalDirection dir? 'direction)
+                    (list 'voltaPadding number? 'padding) 
+                    (list 'voltaMinimumSpace number? 'minimum-space) 
                     )))
   
 (define generic-bar-properties
   (cons "Staff_bar" (list
-                    (list 'barSize number? 'bar-size)
-                    ;(list 'glyph symbol? 'glyph)
-                    )
+                    (list 'barSize number? 'bar-size))
        )
   )    
 
-(define staff-symbol-properties
+; don't do this yet. Depends on whennn the staff is really announced
+(define generic-staff-symbol-properties
   (cons "Staff_symbol" (list
-                       (list 'numberOfStaffLines number? 'line-count)
-                       (list 'staffSpace number? 'staff-space)
                        )
        )
   )
@@ -95,12 +123,21 @@
 (define generic-rest-properties
   (cons "Rest" (list (list 'restStyle string? 'reststyle))))
 
+(define generic-rest-collision-properties
+  (cons "Rest_collision" (list (list 'maximumRestCount number? 'maximum-rest-count))))
+
 (define generic-tie-properties
   (cons "Tie" (list
               (list 'tieVerticalDirection dir? 'direction)
               (list 'verticalDirection dir? 'direction)
+(list 'tieDash number? 'dashed)
   )))
 
+(define generic-tie-column-properties
+  (cons "Tie_column" (list
+                     (list 'tieVerticalDirection dir? 'direction)
+                     (list 'verticalDirection dir? 'direction)
+  )))
 
 (define generic-note-column-properties
   (cons "Note_column"
@@ -129,17 +166,40 @@
        (list
         (list 'timeSignatureStyle string? 'style))))
 
+(define (symbol-or-boolean? s)
+  (or (boolean? s) (symbol? s)))
+
+(define generic-tuplet-spanner-properties
+  (cons "Tuplet_spanner"
+       (list
+        (list 'tupletNumberVisibility symbol-or-boolean? 'tuplet-number-visibility)
+        (list 'tupletBracketVisibility symbol-or-boolean? 'tuplet-bracket-visibility)
+       ))
+)
+
+
+
+
+
+;;;;;;;;;;
+;; don't forget to add these to the Generic_property_list property in
+;; engraver.ly
+
 (define generic-voice-properties
   (list
    generic-stem-properties
    generic-breathing-sign-properties
+   generic-crescendo-properties
+   generic-dynamic-line-spanner-properties
    generic-tie-properties
+   generic-tie-column-properties   
+   generic-tuplet-spanner-properties
    generic-rest-properties
    generic-slur-properties
    generic-beam-properties
    generic-text-properties
    generic-note-column-properties
-   generic-crescendo-properties
+   generic-script-properties
    generic-All-properties
    ))
 
@@ -151,6 +211,9 @@
    generic-timesig-properties
    generic-clef-properties
    generic-collision-properties
+   generic-rest-collision-properties
+   generic-volta-spanner-properties
+;   generic-staff-symbol-properties
    generic-All-properties      
    )
   )
@@ -167,3 +230,7 @@
 
   )
    
+(define generic-lyrics-properties
+  (list generic-text-properties
+  )
+)