patch::: 1.5.4.jcn4

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

diff --git a/scm/generic-property.scm b/scm/generic-property.scm
index 1d53b08a85389cab291aa5bda10e3a3c56b1f5d3..740f0a641afb9ec0d01b57d8edecdfe577489091 100644 (file)
--- a/scm/generic-property.scm
+++ b/scm/generic-property.scm
@@ -25,8 +25,8 @@
         (list 'autoKneeGap number? 'auto-knee-gap)
         (list 'autoInterstaffKneeGap number? 'auto-interstaff-knee-gap)
         (list 'beamDirAlgorithm symbol? 'beam-dir-algorithm)
-        (list 'beamHeight number? 'height-hs)
-        (list 'beamVerticalPosition number? 'y-position-hs)
+        (list 'beamHeight number? 'height)
+        (list 'beamVerticalPosition number? 'staff-position)
         )
        )
   )
@@ -39,7 +39,6 @@
         (list 'verticalDirection dir? 'direction)       
         (list 'stemLength number? 'length)
         (list 'flagStyle string? 'flag-style)
-        (list 'stemCentered boolean? 'stem-centered)
         (list 'noStemExtend boolean? 'no-stem-extend)
         (list 'stemShorten number? 'shorten)
         ))
@@ -79,7 +78,6 @@
 (define generic-sustain-pedal-properties
   (cons 'sustain-pedal-interface
        (list
-        (list 'textScriptPadding number? 'padding)
         (list 'sustainPedalPadding number? 'padding))))
 
 (define generic-chord-name-properties
@@ -121,6 +119,17 @@
        )
   )    
 
+(define generic-bar-number-properties
+  (cons 'bar-number-interface
+       (list
+        (list 'barNumberScriptPadding number? 'padding)
+        (list 'barNumberDirection dir? 'direction)      
+        )
+       
+       )
+  )
+
+  
 ; don't do this yet. Depends on whennn the staff is really announced
 (define generic-staff-symbol-properties
   (cons 'staff-symbol-interface
@@ -145,13 +154,17 @@
 
 (define generic-All-properties
   (cons 'all
-       (list (list 'fontSize number? 'fontsize))))
+       (list (list 'fontSize number? 'font-relative-size))))
 
 
 (define generic-notehead-properties
   (cons 'note-head-interface
        (list (list 'noteHeadStyle symbol? 'style))))
 
+(define generic-notename-properties
+  (cons 'note-name-interface
+       (list (list 'noteNameStyle symbol? 'style))))
+
 
 (define generic-rest-properties
   (cons 'rest-interface