* Documentation/user/changing-defaults.itely (Text encoding): node

[lilypond.git] / scm / define-grobs.scm

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 00b9e655df0e7eb20c85e5654081674152d906b0..26590d342281a03a7175d320f773cb4ccb4d9ef6 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -32,40 +32,48 @@
        (right-padding . 0.15)
        (meta . ((interfaces . (item-interface accidental-placement-interface))))
        ))
-
     (Ambitus
      . (
-       (breakable . #t)
-       (break-align-symbol . ambitus)
+       (axes . (0 1))
+       (X-extent-callback . ,Axis_group_interface::group_extent_callback)
+       (Y-extent-callback . ,Axis_group_interface::group_extent_callback)
+       (space-alist . (
+                       (clef . (extra-space . 0.5))
+                       (key-signature . (extra-space . 0.0))
+                       (staff-bar . (extra-space . 0.0))
+                       (time-signature . (extra-space . 0.0)) 
+                       (first-note . (fixed-space . 0.0))
+                       ))
+       (breakable . #t)
+       (break-align-symbol . ambitus)
+       (break-visibility . ,begin-of-line-visible)
+       (meta . ((interfaces . (axis-group-interface break-aligned-interface ambitus-interface item-interface ))))
+       ))
+
+    (AmbitusLine
+     . (
        (print-function . ,Ambitus::print)
        (join-heads . #t)
-       (break-visibility . ,begin-of-line-visible)
-       (space-alist . (
-                      (clef . (extra-space . 0.0))
-                      (key-signature . (extra-space . 0.0))
-                      (staff-bar . (extra-space . 0.0))
-                      (time-signature . (extra-space . 0.0)) 
-                      (first-note . (fixed-space . 0.0))
-                      ))
-       (meta . ((interfaces . (ambitus-interface staff-symbol-referencer-interface break-aligned-interface item-interface  font-interface))))
+       (thickness . 2)
+       (X-offset-callbacks . (,Self_alignment_interface::centered_on_parent))
+    
+       (meta . ((interfaces . (ambitus-interface staff-symbol-referencer-interface item-interface  font-interface))))
        ))
     (AmbitusAccidental
      . (
        (print-function . ,Accidental_interface::print)
        (font-family . music)
+       (padding . 0.5)
        (X-offset-callbacks . (,Side_position_interface::aligned_side))
        (direction . -1) 
        (cautionary-style . parentheses)
-       (after-line-breaking-callback . ,Accidental_interface::after_line_breaking)             (meta . ((interfaces . (item-interface accidental-interface font-interface))))
+       (after-line-breaking-callback . ,Accidental_interface::after_line_breaking)             (meta . ((interfaces . (item-interface accidental-interface break-aligned-interface side-position-interface font-interface))))
        ))
     (AmbitusNoteHead
      . (
        (duration-log . 2)
        (style . default)
-       (breakable . #t)
        (print-function . ,Note_head::print)
-       (break-align-symbol . ambitus)
-        (break-visibility . ,begin-of-line-visible)
        (glyph-name-procedure . ,find-notehead-symbol)
        (X-extent-callback . ,Note_head::extent)
        (Y-extent-callback . ,Note_head::extent)
@@ -694,7 +702,7 @@
        (Y-extent-callback . #f)                         
        (print-function . ,Line_spanner::print)
        (after-line-breaking-callback . ,Line_spanner::after_line_breaking)
-       (meta . ((interfaces . (line-spanner-interface spanner-interface))))
+       (meta . ((interfaces . (line-spanner-interface line-interface spanner-interface))))
        ))
 
     (NoteName
@@ -969,7 +977,6 @@
        ;; FIXME this should come from 'lengths
 
        (beamed-lengths . (3.26 3.26 1.5))
-;      (beamed-lengths . (3.5 3.5 3.5 4.5 5.0))
        
        ;; We use the normal minima as minimum for the ideal lengths,
        ;; and the extreme minima as abolute minimum length.