*** empty log message ***

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

diff --git a/scm/grob-description.scm b/scm/grob-description.scm
index f6829adbca15ebe1b493126a0d9eb8d44968ce4b..1fb9ace404fd75b63329a5b3a28d2ef89aeb1ba5 100644 (file)
--- a/scm/grob-description.scm
+++ b/scm/grob-description.scm
@@ -2,22 +2,23 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 1998--20.301  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 1998--2002  Han-Wen Nienhuys <hanwen@cs.uu.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 ;;;; distances are given in stafflinethickness (thicknesses) and
 ;;;; staffspace (distances)
 
 ;;;; WARNING: the meta field should be the last one.
+;;;; WARNING: don't use anonymous functions for initialization. 
 
 ;; TODO: junk the meta field in favor of something more compact?
-(define all-grob-descriptions
+(define-public all-grob-descriptions
   `(
     (Accidental
      . (
        (molecule-callback . ,Accidental_interface::brew_molecule)
        (font-family . music)
-       (cautionary-style . smaller)
+       (cautionary-style . parentheses)
        (after-line-breaking-callback . ,Accidental_interface::after_line_breaking)             (meta . ((interfaces . (item-interface accidental-interface font-interface))))
        ))
     (AccidentalPlacement
@@ -77,6 +78,7 @@
                        (custos . (minimum-space . 2.0))
                        (clef .   (minimum-space . 1.0))
                        (first-note . (extra-space . 1.3))
+                       (right-edge . (extra-space . 0.0))
                        ))
 
        ;;
@@ -163,7 +165,7 @@
        
        (outer-stem-length-limit . 0.2)
        (slope-limit . 0.2)
-       (flag-width-function . ,default-beam-flag-width-function)
+       (flag-width-function . ,beam-flag-width-function)
        (damping . 1)
        (auto-knee-gap . 5.5)
        (font-name . "cmr10")
@@ -222,7 +224,8 @@
                        (key-signature . (minimum-space . 4.0))
                        (time-signature . (minimum-space . 4.2))
                        (first-note . (minimum-space . 5.0))
-                       (next-note . (extra-space . 0.5))                       
+                       (next-note . (extra-space . 0.5))
+                       (right-edge . (extra-space . 0.5))
                        ))
        (Y-offset-callbacks  . (,Staff_symbol_referencer::callback)) 
        (meta . ((interfaces . (clef-interface staff-symbol-referencer-interface font-interface break-aligned-interface item-interface ))))
@@ -251,8 +254,12 @@
        (font-family . ancient)
        (space-alist . (
                        (first-note . (minimum-space . 0.0))
+                       (right-edge . (extra-space . 0.1))
                        ))
-       (meta . ((interfaces . (custos-interface staff-symbol-referencer-interface break-aligned-interface item-interface ))))
+       (meta . ((interfaces
+                 . (custos-interface staff-symbol-referencer-interface
+                                     font-interface
+                                     break-aligned-interface item-interface ))))
        ))
 
 
@@ -301,7 +308,7 @@
        (font-family . dynamic)
        (font-shape . italic)
        (self-alignment-Y . 0)
-       (meta . ((interfaces . (font-interface text-interface self-alignment-interface  dynamic-interface item-interface ))))
+       (meta . ((interfaces . (font-interface text-interface self-alignment-interface  dynamic-interface script-interface item-interface ))))
        ))
 
     (DynamicLineSpanner
@@ -318,7 +325,6 @@
     (LeftEdge
      . (
        (break-align-symbol . left-edge)
-       (X-offset-callbacks . (,Break_align_interface::alignment_callback))
        (X-extent-callback . ,Grob::point_dimension_callback)
        (breakable . #t)
        (space-alist . (
@@ -328,7 +334,8 @@
                        (staff-bar . (extra-space . 0.0))
                        (breathing-sign . (minimum-space  . 0.0))
                        (clef . (extra-space . 1.0))
-                       (first-note . (extra-space . 0.0))
+                       (first-note . (extra-space . 1.0))
+                       (right-edge . (extra-space . 0.0))
                        (key-signature . (extra-space . 0.0))
                        ))
        (meta . ((interfaces . (break-aligned-interface item-interface ))))
@@ -376,6 +383,15 @@
        (meta . ((interfaces . (hairpin-interface self-alignment-interface dynamic-interface spanner-interface))))
        ))
 
+    (HorizontalBracket
+     . (
+       (thickness . 1.0)
+       (molecule-callback . ,Horizontal_bracket::brew_molecule)
+       (Y-offset-callbacks . (,Side_position_interface::aligned_side))
+       (padding . 0.2)
+       (direction . -1)
+       (meta . ((interfaces . (horizontal-bracket-interface spanner-interface))))
+       ))
     (InstrumentName
      . (
        (breakable . #t)
@@ -402,6 +418,7 @@
        (space-alist . (
                        (time-signature . (extra-space . 1.25))
                        (staff-bar .  (extra-space . 1.1))
+                       (right-edge . (extra-space . 0.5))
                        (first-note . (extra-space . 2.5))
                        ))
        (Y-offset-callbacks . (,Staff_symbol_referencer::callback))
@@ -434,7 +451,10 @@
        (stem-attachment-function . ,note-head-style->attachment-coordinates)
        (font-family . ancient)
        (style . mensural)
-       (meta . ((interfaces . (ligature-head-interface rhythmic-head-interface note-head-interface staff-symbol-referencer-interface))))
+       (glyph-name-procedure . ,find-notehead-symbol)
+       (meta . ((interfaces . (ligature-head-interface rhythmic-head-interface
+                                                       font-interface
+                                                       note-head-interface staff-symbol-referencer-interface))))
        ))
 
     (LyricHyphen
@@ -481,7 +501,7 @@
        (ligature-primitive-callback . ,Mensural_ligature::brew_ligature_primitive)
        (molecule-callback . ,Mensural_ligature::brew_molecule)
        (font-family . ancient)
-       (meta . ((interfaces . (mensural-ligature-interface))))
+       (meta . ((interfaces . (mensural-ligature-interface font-interface))))
        ))
 
     (Porrectus
@@ -523,6 +543,7 @@
        (number-threshold . 1)
        (padding . 1)
        (thickness . 6.6)
+       (use-breve-rest . #f)
        (font-family . number)
        (padding . 1)
        (meta . ((interfaces . (multi-measure-rest-interface rest-interface font-interface staff-symbol-referencer-interface spanner-interface))))
@@ -550,6 +571,7 @@
      . (
        (style . default)
        (molecule-callback . ,Note_head::brew_molecule)
+       (glyph-name-procedure . ,find-notehead-symbol)
        (Y-offset-callbacks  . (,Staff_symbol_referencer::callback))
        (stem-attachment-function . ,note-head-style->attachment-coordinates)
        (meta . ((interfaces . (rhythmic-head-interface font-interface note-head-interface staff-symbol-referencer-interface item-interface ))))
@@ -687,7 +709,7 @@
        (Y-extent-callback . ,Rest::extent_callback)            
        (molecule-callback . ,Rest::brew_molecule)
        (Y-offset-callbacks . (,Staff_symbol_referencer::callback)) 
-       (minimum-beam-collision-distance . 1.5)
+       (minimum-beam-collision-distance . 0.75)
        (meta . (
                 (interfaces . (font-interface
                                rhythmic-head-interface
@@ -777,7 +799,8 @@
        (thin-kern . 3.0)
        (hair-thickness . 1.6)
        (thick-thickness . 6.0)
-       (meta . ((interfaces . (span-bar-interface bar-line-interface item-interface ))))
+       (meta . ((interfaces . (span-bar-interface font-interface
+                                                  bar-line-interface item-interface ))))
        ))
 
     (StanzaNumber
@@ -830,6 +853,8 @@
      . (
        (axes . (1))
        (Y-extent-callback . ,Axis_group_interface::group_extent_callback)      
+       (Y-offset-callbacks . (,Side_position_interface::aligned_side))
+       
 
        (padding . 1.2)
        (minimum-space . 1.0)
@@ -933,7 +958,8 @@
     (SustainPedalLineSpanner 
      . (
        (axes . (1))
-       (Y-extent-callback . ,Axis_group_interface::group_extent_callback)      
+       (Y-extent-callback . ,Axis_group_interface::group_extent_callback)
+       (Y-offset-callbacks . (,Side_position_interface::aligned_side))
        
        (padding . 1.2)
        (minimum-space . 1.0)
@@ -1017,8 +1043,13 @@
        (style . default)
        (molecule-callback . ,tablature-molecule-callback)
        (Y-offset-callbacks  . (,Staff_symbol_referencer::callback))
+       (extra-offset . (0 . -0.65)) ;; UGH! TODO: Clean this up!
        (stem-attachment-function . ,tablature-stem-attachment-function)
-       (meta . ((interfaces . (rhythmic-head-interface font-interface note-head-interface staff-symbol-referencer-interface item-interface ))))
+       (meta . ((interfaces
+                 . (rhythmic-head-interface
+                    font-interface
+                    note-head-interface staff-symbol-referencer-interface
+                    text-interface item-interface ))))
        ))
 
 
@@ -1050,6 +1081,7 @@
        (break-visibility . ,all-visible)
        (space-alist . (
                        (first-note . (extra-space . 2.0))
+                       (right-edge . (extra-space . 0.5))
                        (staff-bar .  (minimum-space . 2.0))
                        ))
        (breakable . #t)
@@ -1094,6 +1126,8 @@
      . (
        (axes . (1))
        (Y-extent-callback . ,Axis_group_interface::group_extent_callback)      
+       (Y-offset-callbacks . (,Side_position_interface::aligned_side))
+       
        (padding . 1.2)
        (minimum-space . 1.0)
        (direction . -1)
@@ -1139,7 +1173,6 @@
 (define (completize-grob-entry x)
   "transplant assoc key into 'name entry of 'meta of X
 "
-
   (let* ((name-sym  (car x))
         (grob-entry (cdr x))
         (metaentry (cdr (assoc 'meta grob-entry)))