release: 1.5.31

[lilypond.git] / scm / grob-description.scm

diff --git a/scm/grob-description.scm b/scm/grob-description.scm
index 5e09ffe9ad3ba307c410b23e2fb1383c9ef7cfcb..bc592243342c454d14f0aa0d98b5d2be830fa9a8 100644 (file)
--- a/scm/grob-description.scm
+++ b/scm/grob-description.scm
@@ -1,4 +1,3 @@
-
 ;;;; grob-description.scm -- part of generated backend documentation
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
@@ -19,7 +18,9 @@
     ))
 
 
-;;; WARNING: the meta field should be the last one. 
+;;; WARNING: the meta field should be the last one.
+
+;; TODO: junk the meta field in favor of something more compact?
 (define all-grob-descriptions
   `(
     (Accidentals . (
@@ -135,10 +136,13 @@
        (BreathingSign . (
                (break-align-symbol . Breathing_sign)
                (breakable . #t )
-               (molecule-callback . ,Breathing_sign::brew_molecule)
+               (molecule-callback . ,Text_item::brew_molecule)
+               (lookup . name)
+               (font-family . music)
+               (text . "scripts-rcomma")
                (Y-offset-callbacks . (,Breathing_sign::offset_callback))
                (visibility-lambda . ,begin-of-line-invisible)
-               (meta . ,(grob-description  break-aligned-interface))
+               (meta . ,(grob-description  break-aligned-interface text-interface font-interface))
        ))
 
        (Clef . (
@@ -233,8 +237,9 @@
                (molecule-callback . ,Text_item::brew_molecule)
                (X-offset-callbacks . (,Side_position_interface::centered_on_parent ,Side_position_interface::aligned_on_self))
                (padding . 0.6)
-               (direction . -1)
+;              (direction . -1)
                (self-alignment-X . 0)
+               (self-alignment-Y . 0)
                (font-family . number)
                (font-relative-size . -3)
                (font-shape . upright)
@@ -424,8 +429,7 @@
        
        (PaperColumn . (
                (axes 0)
-               (before-grace-spacing-factor . 1.2)
-                (before-musical-spacing-factor . 0.4)
+;              (molecule-callback . ,Paper_column::brew_molecule) (font-name . "cmr8")
                (meta . ,(grob-description paper-column-interface axis-group-interface spaceable-element-interface))
        ))
        (PhrasingSlur . (
@@ -452,8 +456,7 @@
        
        (NonMusicalPaperColumn . (
                 (axes 0)
-                (before-musical-spacing-factor . 1.0)
-               (column-space-strength . 2.0)
+;      (molecule-callback . ,Paper_column::brew_molecule) (font-name . "cmr8")
                (meta . ,(grob-description paper-column-interface axis-group-interface spaceable-element-interface))
         ))
 
@@ -528,13 +531,13 @@
                 ))
              
        (SpacingSpanner . (
-               (spacing-procedure . ,Spacing_spanner::set_springs)
-               (stem-spacing-correction . 0.5)
+               (spacing-procedure .  ,Third_spacing_spanner::set_springs)
                (grace-space-factor . 0.8)
 
                ;; TODO: change naming -- unintuitive
                (arithmetic-basicspace . 2.0)
                (arithmetic-multiplier . ,(* 0.9 1.32))
+
                ;; assume that notes at least this long are present.
                (maximum-duration-for-spacing . ,(make-moment 1 8))
                (meta . ,(grob-description  spacing-spanner-interface))
@@ -566,7 +569,22 @@
                (break-align-symbol . Clef_item)
                (visibility-lambda . ,begin-of-line-visible)
                (font-family . roman)
-               (meta . ,(grob-description break-aligned-interface text-interface font-interface))
+               (meta . ,(grob-description break-aligned-interface text-interface font-interface))              
+       ))
+
+       (StaffSpacing . (
+               (breakable . #t)
+               (X-extent-callback . #f)
+               (Y-extent-callback . #f)
+
+               (meta . ,(grob-description staff-spacing-interface))
+       ))
+       (NoteSpacing . (
+               (X-extent-callback . #f)
+               (Y-extent-callback . #f)
+               (stem-spacing-correction . 0.)
+               (space-factor . 1.0)
+               (meta . ,(grob-description note-spacing-interface))
        ))
 
        (StaffSymbol . (
@@ -792,5 +810,12 @@
 
 (set! all-grob-descriptions (map completize-grob-entry all-grob-descriptions))
 
+
+
 ;  (display  (map pair? all-grob-descriptions))
 
+
+;; make sure that \property Foo.Bar =\turnOff doesn't complain
+
+(map (lambda (x) (set-object-property! (car x) 'translator-type? list?))
+     all-grob-descriptions)