use usescons for using scons.

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index b7cdfff34b737c085a8d7d5e9db4e5f3f5a983a5..57d5c0b92ffc5ef7dc0ac460dfed8b8a3b164cca 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -563,8 +563,6 @@
        (print-function . ,Text_item::print)
        (Y-offset-callbacks . (,Side_position_interface::aligned_side)) 
        (direction . 1)
-       (breakable . #t)
-       (break-visibility . ,end-of-line-invisible)
        (padding . 0.8)
        (meta . ((interfaces . (text-interface side-position-interface font-interface metronome-mark-interface item-interface))))
        ))
@@ -686,7 +684,7 @@
        (print-function . ,Text_item::print)
 
        ;; no Y dimensions, because of lyrics under tenor clef.
-       (Y-extent-callback . #f)
+       (Y-extent . (0 . 0))
        (font-shape . italic)
        (padding . 0.6)
        (staff-padding . 0.2)
@@ -700,7 +698,7 @@
        (before-line-breaking-callback . ,Paper_column::before_line_breaking)
        (X-extent-callback . ,Axis_group_interface::group_extent_callback)
 
-;ppp           (print-function . ,Paper_column::print) (font-name . "cmr8") (Y-extent-callback . #f)
+;              (print-function . ,Paper_column::print) (font-name . "ecrm8") (Y-extent-callback . #f)
        (meta . ((interfaces . (paper-column-interface axis-group-interface spaceable-grob-interface item-interface ))))
        ))
 
@@ -736,7 +734,7 @@
        (before-line-breaking-callback . ,Paper_column::before_line_breaking)
        (breakable . #t)
        ;; debugging stuff: print column number.
-;      (print-function . ,Paper_column::print) (font-name . "cmr8")    (Y-extent-callback . #f)
+;      (print-function . ,Paper_column::print) (font-name . "ecrm8")   (Y-extent-callback . #f)
 
 
        (meta .  ((interfaces . (paper-column-interface axis-group-interface spaceable-grob-interface item-interface ))))
@@ -830,15 +828,20 @@
 
     (Slur
      . (
-       (print-function . ,Slur::print)
+       (print-function . ; ,New_slur::print)
+                       ,Slur::print)
        (thickness . 1.2)               
        (spacing-procedure . ,Spanner::set_spacing_rods)                
        (minimum-length . 1.5)
-       (after-line-breaking-callback . ,Slur::after_line_breaking)
+       (after-line-breaking-callback . ; ,New_slur::after_line_breaking)
+                                     ,Slur::after_line_breaking)
        (extremity-function . ,calc-slur-extremity)
        (extremity-offset-alist . ,default-slur-extremity-offset-alist)
        (de-uglify-parameters . (1.5  0.8  -2.0))
-       (Y-extent-callback . ,Slur::height)
+       (Y-extent-callback .
+                          ;; ,#f)
+                          ;; must be of type procedure
+                          ,Slur::height)
        (height-limit . 2.0)
        (ratio . 0.333)
        (beautiful . 0.5)
@@ -868,7 +871,6 @@
        (break-align-symbol . staff-bar)
        (bar-size-procedure . ,Span_bar::get_bar_size) 
        (print-function . ,Span_bar::print)
-       (break-visibility . ,begin-of-line-invisible)
        (X-extent-callback . ,Span_bar::width_callback)
        (Y-extent-callback . ())
        (breakable . #t)
@@ -965,8 +967,8 @@
 
        ;; 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))
+       (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.