Merge with git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond.git

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 1b640cbde024a1972c45c21f445cb7ec8b9a29e5..5e2dd4d86c14ea0572aadc11d7d5ae6a9e2f28b1 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -51,6 +51,7 @@
                                accidental-suggestion-interface
                                self-alignment-interface
                                font-interface))))))
+
     (AccidentalPlacement
      . (
        (left-padding . 0.2)
@@ -144,6 +145,14 @@
                                side-position-interface
                                font-interface))))))
 
+    (BalloonTextItem 
+     . ((stencil . ,ly:balloon-interface::print)
+       (text . ,(grob::calc-property-by-copy 'text)) 
+       (X-offset . ,(grob::calc-property-by-copy 'X-offset)) 
+       (Y-offset . ,(grob::calc-property-by-copy 'Y-offset)) 
+       (meta . ((class . Item)
+                (interfaces . (text-interface
+                               font-interface))))))
     (BarLine
      . (
        (break-align-symbol . staff-bar)
@@ -413,6 +422,7 @@
        (stencil . ,ly:clef::print)
        (glyph-name . ,ly:clef::calc-glyph-name)
        (non-musical . #t)
+       (avoid-slur . inside)
        (font-family . music)
        (break-align-symbol . clef)
        (break-visibility . ,begin-of-line-visible)
@@ -649,8 +659,9 @@
                                item-interface))))))
     (FretBoard
      . ((stencil . ,fret-board::calc-stencil)
+       (finger-code . below-string)
        (meta . ((class . Item)
-                (interfaces . (fret-board-interface
+                (interfaces . (fret-diagram-interface
                                font-interface
                                ))))
              ))
@@ -783,6 +794,7 @@
     (KeySignature
      . (
        (stencil . ,ly:key-signature-interface::print)
+       (avoid-slur . inside)
        (space-alist . (
                        (time-signature . (extra-space . 1.15))
                        (staff-bar . (extra-space . 1.1))
@@ -802,9 +814,10 @@
      . (
        (stencil  . ,ly:tie::print)
        (control-points . ,ly:semi-tie::calc-control-points)
-       (direction . ,ly:semi-tie::calc-direction)
+       (direction . ,ly:tie::calc-direction)
        (details . ((ratio . 0.333)
                    (height-limit . 1.0)))
+       (head-direction . ,LEFT)
        (thickness . 1.0)
        (meta . ((class . Item)
                 (interfaces . (semi-tie-interface))
@@ -918,7 +931,7 @@
     (LyricText
      . (
        (stencil . ,lyric-text::print)
-       (text . ,lyric-text::calc-text)
+       (text . ,(grob::calc-property-by-copy 'text)) 
        (X-offset . ,ly:self-alignment-interface::aligned-on-x-parent)
        (self-alignment-X . 0)
        (word-space . 0.6)
@@ -1264,7 +1277,6 @@
                                mark-interface
                                self-alignment-interface))))))
 
-
     (RepeatSlash
      . (
        (stencil . ,ly:percent-repeat-item-interface::beat-slash)
@@ -1272,14 +1284,16 @@
        (slope . 1.7)
        (meta . ((class . Item)
                 (interfaces . (percent-repeat-interface))))))
+
     (RepeatTie
      . (
        (stencil  . ,ly:tie::print)
        (control-points . ,ly:semi-tie::calc-control-points)
-       (direction . ,ly:semi-tie::calc-direction)
+       (direction . ,ly:tie::calc-direction)
        (details . ((ratio . 0.333)
                    (height-limit . 1.0)))
        (thickness . 1.0)
+       (head-direction . ,RIGHT)
        (meta . ((class . Item)
                 (interfaces . (semi-tie-interface))
                 ))
@@ -1289,7 +1303,9 @@
      . (
        (X-extent . #f)
        (Y-extent . #f)
+       (direction . ,ly:tie::calc-direction)
        (head-direction . ,RIGHT)
+       
        (positioning-done . ,ly:semi-tie-column::calc-positioning-done)
        (meta . ((class . Item)
                 (interfaces . (semi-tie-column-interface))
@@ -1299,7 +1315,7 @@
     (Rest
      . (
        (stencil . ,ly:rest::print)
-       (duration-log . ,note-head::calc-duration-log)
+       (duration-log . ,stem::calc-duration-log)
        (X-extent . ,ly:rest::width)
        (Y-extent . ,ly:rest::height)
        (Y-offset . ,ly:rest::y-offset-callback)
@@ -1350,8 +1366,9 @@
 
     (SeparationItem
      . (
-       (X-extent . #f)
-       (Y-extent . #f)
+       (avoid-slur . inside)
+       (X-extent . ,ly:axis-group-interface::width)
+       (Y-extent . ,ly:axis-group-interface::height)
        (meta . ((class . Item)
                 (interfaces . (spacing-interface
                                separation-item-interface))))))
@@ -1486,7 +1503,7 @@
     (Stem
      . (
        (direction . ,ly:stem::calc-direction)
-       (duration-log . ,note-head::calc-duration-log)
+       (duration-log . ,stem::calc-duration-log)
        (default-direction . ,ly:stem::calc-default-direction)
        (stem-end-position . ,ly:stem::calc-stem-end-position)
 
@@ -1626,6 +1643,7 @@
        (axes . (0 1))
        (X-extent . ,ly:axis-group-interface::width)
        (Y-extent . ,ly:axis-group-interface::height)
+       (skyline-spacing . #t)
        (meta . ((class . System)
                 (interfaces . (system-interface
                                axis-group-interface))))))
@@ -1693,7 +1711,6 @@
      . (
        (stencil . ,ly:text-interface::print)
        (Y-offset . ,ly:staff-symbol-referencer::callback)
-       (duration-log . ,note-head::calc-duration-log)
        (font-size . -2)
        (stem-attachment . (0.0 . 1.35))
        (font-series . bold)
@@ -1794,6 +1811,7 @@
        (stencil . ,ly:time-signature::print)
        (break-align-symbol . time-signature)
        (break-visibility . ,all-visible)
+       (avoid-slur . inside)
        (space-alist . (
                        (first-note . (fixed-space . 2.0))
                        (right-edge . (extra-space . 0.5))
@@ -1950,6 +1968,7 @@
        (Y-offset . ,ly:hara-kiri-group-spanner::force-hara-kiri-callback)
        (Y-extent . ,ly:hara-kiri-group-spanner::y-extent)
        (X-extent . ,ly:axis-group-interface::width)
+       (skyline-spacing . #t)
        (meta . ((class . Spanner)
                 (interfaces . (axis-group-interface
                                hara-kiri-group-interface