* The grand 2005-2006 replace.

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 1773f5a7dfc222298d9cc244ced9fd2edaaf13b2..9a3a8432f2afdae5e8d503837f59bb9bcda87642 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 1998--2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 ;;;; distances are given in linethickness (thicknesses) and
@@ -103,7 +103,7 @@
        (font-family . music)
        (padding . 0.5)
        (X-offset . ,Side_position_interface::x_aligned_side)
-       (direction . -1)
+       (direction . ,LEFT)
        (cautionary-style . parentheses)
 
        (stencil . ,Accidental_interface::print)
@@ -138,7 +138,7 @@
        (stencil . ,Arpeggio::print)
        (Y-offset . ,Staff_symbol_referencer::callback)
        (X-offset . ,Side_position_interface::x_aligned_side)
-       (direction . -1)
+       (direction . ,LEFT)
        (padding . 0.5)
        (side-axis . ,X)
        (staff-position . 0.0)
@@ -190,7 +190,7 @@
        (breakable . #t)
        (break-visibility . ,begin-of-line-visible)
        (padding . 1.0)
-       (direction . 1)
+       (direction . ,UP)
        (font-family . roman)
        (font-size . -2)
        (Y-offset . ,Side_position_interface::y_aligned_side)
@@ -283,7 +283,7 @@
 
        ;; TODO: should be in SLT.
        (thickness . 0.48) ; in staff-space
-       (neutral-direction . -1)
+       (neutral-direction . ,DOWN)
 
        ;; Whe have some unreferenced problems here.
        ;;
@@ -462,7 +462,7 @@
        (no-spacing-rods . #t)
        (Y-offset . ,Side_position_interface::y_aligned_side)
        (X-offset . ,Self_alignment_interface::x_aligned_on_self)
-       (direction . 1)
+       (direction . ,UP)
        (padding . 0.5)
        (staff-padding . 0.5)
        (script-priority . 200)
@@ -485,7 +485,7 @@
 
        (break-visibility . ,end-of-line-visible)
        (style . vaticana)
-       (neutral-direction . -1)
+       (neutral-direction . ,DOWN)
        (Y-offset . ,Staff_symbol_referencer::callback)
        (space-alist . (
                        (first-note . (minimum-fixed-space . 0.0))
@@ -546,7 +546,7 @@
        (font-encoding . fetaNumber)
        (self-alignment-X . 0)
        (font-size . -2) 
-       (direction . 1)
+       (direction . ,UP)
        (padding . 0.2)
        (staff-padding . 0.25)
        (side-axis . ,Y)
@@ -565,7 +565,7 @@
        (avoid-slur . outside)
        (slur-padding . 0.3)
        (minimum-space . 1.2)
-       (direction . -1)
+       (direction . ,DOWN)
        (side-axis . ,Y)
 
        (Y-extent . ,Axis_group_interface::height)
@@ -593,6 +593,7 @@
        (font-series . bold)
        (font-encoding . fetaDynamic)
        (font-shape . italic)
+       (avoid-slur . around)
        (no-spacing-rods . #t)
        (script-priority . 100)
        (meta . ((class . Item)
@@ -717,7 +718,7 @@
        (Y-offset . ,Side_position_interface::y_aligned_side)
        (padding . 0.2)
        (staff-padding . 0.2)
-       (direction . -1)
+       (direction . ,DOWN)
        (side-axis . ,Y)
        (bracket-flare . (0.5 . 0.5))
        (meta . ((class . Spanner)
@@ -733,7 +734,7 @@
        
        ;; This direction is for aligned_on_support_refpoints
        ;; (?) --hwn
-       (direction . 0)
+       (direction . ,CENTER)
        (space-alist . (
                        (left-edge . (extra-space . 1.0))))
 
@@ -861,7 +862,7 @@
        (thickness . 1.6)
        (edge-height . (0.7 . 0.7))
        (shorten-pair . (-0.2 . -0.2))
-       (direction . 1)
+       (direction . ,UP)
        (positions . ,Tuplet_bracket::calc_positions)
        (stencil . ,Tuplet_bracket::print)
        
@@ -885,6 +886,7 @@
        (Y-extent . (0 . 0))
        (meta . ((class . Spanner)
                 (interfaces . (lyric-interface
+                               font-interface
                                lyric-hyphen-interface
                                spanner-interface))))))
 
@@ -928,6 +930,28 @@
                                text-interface
                                font-interface))))))
 
+
+    (MeasureGrouping
+     . (
+       (Y-offset . ,Side_position_interface::y_aligned_side)
+       (side-axis . ,Y)
+
+       (stencil . ,Measure_grouping::print)
+
+       (padding . 2)
+       (direction . ,UP)
+       (thickness . 1)
+       (height . 2.0)
+       (staff-padding . 3)
+       (meta . ((class . Spanner)
+                (interfaces . (side-position-interface
+                               measure-grouping-interface))))))
+
+    (MelodyItem
+     . (
+       (neutral-direction . ,DOWN)
+       (meta . ((class . Item)
+                (interfaces . (melody-spanner-interface spacing-interface))))))
     (MensuralLigature
      . (
        (thickness . 1.4)
@@ -944,7 +968,7 @@
        (stencil . ,Text_interface::print)
 
        (Y-offset . ,Side_position_interface::y_aligned_side)
-       (direction . 1)
+       (direction . ,UP)
        (padding . 0.8)
        (side-axis . ,Y)
        (meta . ((class . Item)
@@ -953,21 +977,6 @@
                                font-interface
                                metronome-mark-interface))))))
 
-    (MeasureGrouping
-     . (
-       (Y-offset . ,Side_position_interface::y_aligned_side)
-       (side-axis . ,Y)
-
-       (stencil . ,Measure_grouping::print)
-
-       (padding . 2)
-       (direction . 1)
-       (thickness . 1)
-       (height . 2.0)
-       (staff-padding . 3)
-       (meta . ((class . Spanner)
-                (interfaces . (side-position-interface
-                               measure-grouping-interface))))))
 
     (MultiMeasureRest
      . (
@@ -998,7 +1007,7 @@
        (side-axis . ,Y)
 
        (self-alignment-X . 0)
-       (direction . 1)
+       (direction . ,UP)
        (padding . 0.4)
        (staff-padding . 0.4)
        (font-encoding . fetaNumber)
@@ -1019,7 +1028,7 @@
        
        (Y-offset . ,Side_position_interface::y_aligned_side)
        (self-alignment-X . 0)
-       (direction . 1)
+       (direction . ,UP)
        (padding . 0.2)
        (staff-padding . 0.25)
        (meta . ((class . Spanner)
@@ -1127,7 +1136,7 @@
        (minimum-length . 1.0)
        (dash-fraction . 0.3)
        (edge-height . (0 . 1.2))
-       (direction . 1)
+       (direction . ,UP)
        (meta . ((class . Spanner)
                 (interfaces . (ottava-bracket-interface
                                horizontal-bracket-interface
@@ -1153,7 +1162,7 @@
                                spaceable-grob-interface))))))
 
     (PhrasingSlur
-     . ((slur-details . ,default-slur-details)
+     . ((details . ,default-slur-details)
 
        (control-points . ,Slur::calc_control_points)
        (direction . ,Slur::calc_direction)
@@ -1208,7 +1217,7 @@
                           ,(ly:make-simple-closure (list Self_alignment_interface::x_aligned_on_self)))))
        (Y-offset . ,Side_position_interface::y_aligned_side)
        (self-alignment-X . 0)
-       (direction . 1)
+       (direction . ,UP)
        (padding . 0.2)
        (staff-padding . 0.25)
        (font-size . -2) 
@@ -1228,7 +1237,7 @@
 
        (style . line)
        (bound-padding . 1.0)
-       (direction . -1)
+       (direction . ,DOWN)
        (bracket-flare . (0.5 . 0.5))
        (edge-height . (1.0 . 1.0))
        (shorten-pair . (0.0 . 0.0))
@@ -1249,7 +1258,7 @@
                      ))
        (Y-offset . ,Side_position_interface::y_aligned_side)
        (self-alignment-X . 0)
-       (direction . 1)
+       (direction . ,UP)
        (breakable . #t)
        (font-size . 2)
        (baseline-skip . 2)
@@ -1342,7 +1351,7 @@
                                separation-spanner-interface))))))
 
     (Slur
-     . ((slur-details . ,default-slur-details)
+     . ((details . ,default-slur-details)
 
        (control-points . ,Slur::calc_control_points)
        (direction . ,Slur::calc_direction)
@@ -1447,7 +1456,7 @@
 
        (stencil . ,Text_interface::print)
 
-       (direction . 1)
+       (direction . ,RIGHT)
        (X-offset . ,Self_alignment_interface::x_aligned_on_self)
        (no-spacing-rods . #t)
        (padding . 0.0) ;; padding relative to SostenutoPedalLineSpanner
@@ -1469,7 +1478,7 @@
 
        (padding . 1.2)
        (minimum-space . 1.0)
-       (direction . -1)
+       (direction . ,DOWN)
        (meta . ((class . Spanner)
                 (interfaces . (piano-pedal-interface
                                axis-group-interface
@@ -1489,6 +1498,7 @@
     (Stem
      . (
        (direction . ,Stem::calc_direction)
+       (default-direction . ,Stem::calc_default_direction)
        (stem-end-position . ,Stem::calc_stem_end_position)
        (stem-info . ,Stem::calc_stem_info)
        (positioning-done . ,Stem::calc_positioning_done)
@@ -1529,7 +1539,7 @@
 
 
        ;; default stem direction for note on middle line
-       (neutral-direction . -1)
+       (neutral-direction . ,DOWN)
 
        ;; We use the normal minima as minimum for the ideal lengths,
        ;; and the extreme minima as abolute minimum length.
@@ -1555,7 +1565,7 @@
        (no-spacing-rods . #t)
        (stencil . ,Sustain_pedal::print)
        (self-alignment-X . 0)
-       (direction . 1)
+       (direction . ,RIGHT)
        (padding . 0.0)  ;; padding relative to SustainPedalLineSpanner
        (X-offset . ,Self_alignment_interface::x_aligned_on_self)
        (meta . ((class . Item)
@@ -1574,7 +1584,7 @@
        (padding . 1.2)
        (staff-padding . 1.2)
        (minimum-space . 1.0)
-       (direction . -1)
+       (direction . ,DOWN)
        (meta . ((class . Spanner)
                 (interfaces . (piano-pedal-interface
                                axis-group-interface
@@ -1665,7 +1675,7 @@
      . (
        (no-spacing-rods . #t)
        (X-offset . ,Self_alignment_interface::x_aligned_on_self)
-       (direction . -1)
+       (direction . ,DOWN)
 
        ;; sync with Fingering ?
        (padding . 0.5)
@@ -1694,7 +1704,7 @@
        (dash-fraction . 0.2)
        (dash-period . 3.0)
        (side-axis . ,Y)
-       (direction . 1)
+       (direction . ,UP)
        (meta . ((class . Spanner)
                 (interfaces . (text-spanner-interface
                                side-position-interface
@@ -1703,6 +1713,7 @@
     (Tie
      . (
        (control-points . ,Tie::calc_control_points)
+       (avoid-slur . inside)
        (direction . ,Tie::calc_direction)
        (stencil . ,Tie::print)
        (details . ((ratio . 0.333)
@@ -1746,7 +1757,7 @@
        (style . trill)
        (staff-padding . 1.0)
        (padding . 0.5)
-       (direction . 1)
+       (direction . ,UP)
        (Y-offset . ,Side_position_interface::y_aligned_side)
        (side-axis . ,Y)
        (meta . ((class . Spanner)
@@ -1803,24 +1814,35 @@
        (thickness . 1.6)
        (edge-height . (0.7 . 0.7))
        (shorten-pair . (-0.2 . -0.2))
+       (staff-padding . 0.25)
+       
        (direction  . ,Tuplet_bracket::calc_direction)
        (positions . ,Tuplet_bracket::calc_positions)
+       (connect-to-neighbor . ,Tuplet_bracket::calc_connect_to_neighbors)
+       (control-points . ,Tuplet_bracket::calc_control_points)
        (stencil . ,Tuplet_bracket::print)
+       
+       (meta . ((class . Spanner)
+                (interfaces . (line-interface
+                               tuplet-bracket-interface))))))
+
+    (TupletNumber
+     . (
+       (stencil . ,Tuplet_number::print)
        (font-shape . italic)
        (font-size . -2)
+       (avoid-slur . inside)
        (meta . ((class . Spanner)
-                (interfaces . (text-interface
-                               line-interface
-                               tuplet-bracket-interface
+                (interfaces . (text-interface tuplet-number-interface
                                font-interface))))))
-
+    
     (UnaCordaPedal
      . (
        (stencil . ,Text_interface::print)
        (font-shape . italic)
        (no-spacing-rods . #t)
        (self-alignment-X . 0)
-       (direction . 1)
+       (direction . ,RIGHT)
        (padding . 0.0)  ;; padding relative to UnaCordaPedalLineSpanner
        (X-offset . ,Self_alignment_interface::x_aligned_on_self)
        (meta . ((class . Item)
@@ -1837,7 +1859,7 @@
        (padding . 1.2)
        (staff-padding . 1.2)
        (minimum-space . 1.0)
-       (direction . -1)
+       (direction . ,DOWN)
        (meta . ((class . Spanner)
                 (interfaces . (piano-pedal-interface
                                axis-group-interface
@@ -1878,7 +1900,7 @@
      . (
        (breakable . #t)
        (Y-offset . ,Side_position_interface::y_aligned_on_support_refpoints)
-       (direction . 0)
+       (direction . ,CENTER)
        (space-alist . ((left-edge . (extra-space . 1.0))))
        (break-align-symbol . instrument-name)
        (stencil . ,Text_interface::print)